From 7d60f3f4a40c72ece812ce7c615088168806ed55 Mon Sep 17 00:00:00 2001
From: Assistant <assistant.moetron@gmail.com>
Date: Tue, 19 May 2020 02:10:44 -0600
Subject: [PATCH] bug fixes

---
 ModAssistant/App.xaml.cs                      | 16 +++++++++++--
 .../Classes/External Interfaces/BeatSaver.cs  | 24 ++++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/ModAssistant/App.xaml.cs b/ModAssistant/App.xaml.cs
index e9b0c21..4bed457 100644
--- a/ModAssistant/App.xaml.cs
+++ b/ModAssistant/App.xaml.cs
@@ -70,10 +70,10 @@ namespace ModAssistant
             ReinstallInstalledMods = ModAssistant.Properties.Settings.Default.ReinstallInstalled;
 
             await ArgumentHandler(e.Args);
-            await Init(Update, GUI);
+            await Init();
         }
 
-        private async Task Init(bool Update, bool GUI)
+        private async Task Init()
         {
             if (Update)
             {
@@ -85,6 +85,10 @@ namespace ModAssistant
                 MainWindow window = new MainWindow();
                 window.Show();
             }
+            else
+            {
+                Application.Current.Shutdown();
+            }
         }
 
         private async Task ArgumentHandler(string[] args)
@@ -103,6 +107,8 @@ namespace ModAssistant
                             await OneClickInstaller.InstallAsset(args[1]);
                         }
 
+                        Current.Shutdown();
+
                         Update = false;
                         GUI = false;
                         args = Shift(args, 2);
@@ -156,6 +162,12 @@ namespace ModAssistant
                         args = Shift(args, 2);
                         break;
 
+                    case "--runforever":
+                        while (true)
+                        {
+
+                        }
+
                     default:
                         Utils.SendNotify((string)Current.FindResource("App:UnrecognizedArgument"));
                         args = Shift(args);
diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs
index 3fda4a6..8022bae 100644
--- a/ModAssistant/Classes/External Interfaces/BeatSaver.cs	
+++ b/ModAssistant/Classes/External Interfaces/BeatSaver.cs	
@@ -103,23 +103,29 @@ namespace ModAssistant.API
             BeatSaverRatelimit ratelimit = new BeatSaverRatelimit();
 
 
-            if (headers.TryGetValues("Rate-Limit-Remaining", out IEnumerable<string> Remaining))
+            if (headers.TryGetValues("Rate-Limit-Remaining", out IEnumerable<string> _remaining))
             {
-                Remaining.GetEnumerator().MoveNext();
-                ratelimit.Remaining = Int32.Parse(Remaining.GetEnumerator().Current);
+                var Remaining = _remaining.GetEnumerator();
+                Remaining.MoveNext();
+                ratelimit.Remaining = Int32.Parse(Remaining.Current);
+                Remaining.Dispose();
             }
 
-            if (headers.TryGetValues("Rate-Limit-Reset", out IEnumerable<string> Reset))
+            if (headers.TryGetValues("Rate-Limit-Reset", out IEnumerable<string> _reset))
             {
-                Reset.GetEnumerator().MoveNext();
-                ratelimit.Reset = Int32.Parse(Reset.GetEnumerator().Current);
+                var Reset = _reset.GetEnumerator();
+                Reset.MoveNext();
+                ratelimit.Reset = Int32.Parse(Reset.Current);
                 ratelimit.ResetTime = UnixTimestampToDateTime((long)ratelimit.Reset);
+                Reset.Dispose();
             }
 
-            if (headers.TryGetValues("Rate-Limit-Total", out IEnumerable<string> Total))
+            if (headers.TryGetValues("Rate-Limit-Total", out IEnumerable<string> _total))
             {
-                Total.GetEnumerator().MoveNext();
-                ratelimit.Total = Int32.Parse(Total.GetEnumerator().Current);
+                var Total = _total.GetEnumerator();
+                Total.MoveNext();
+                ratelimit.Total = Int32.Parse(Total.Current);
+                Total.Dispose();
             }
 
             return ratelimit;