bug fixes

This commit is contained in:
Assistant 2020-05-19 02:10:44 -06:00
parent 80a9339227
commit 7d60f3f4a4
2 changed files with 29 additions and 11 deletions

View file

@ -70,10 +70,10 @@ namespace ModAssistant
ReinstallInstalledMods = ModAssistant.Properties.Settings.Default.ReinstallInstalled; ReinstallInstalledMods = ModAssistant.Properties.Settings.Default.ReinstallInstalled;
await ArgumentHandler(e.Args); await ArgumentHandler(e.Args);
await Init(Update, GUI); await Init();
} }
private async Task Init(bool Update, bool GUI) private async Task Init()
{ {
if (Update) if (Update)
{ {
@ -85,6 +85,10 @@ namespace ModAssistant
MainWindow window = new MainWindow(); MainWindow window = new MainWindow();
window.Show(); window.Show();
} }
else
{
Application.Current.Shutdown();
}
} }
private async Task ArgumentHandler(string[] args) private async Task ArgumentHandler(string[] args)
@ -103,6 +107,8 @@ namespace ModAssistant
await OneClickInstaller.InstallAsset(args[1]); await OneClickInstaller.InstallAsset(args[1]);
} }
Current.Shutdown();
Update = false; Update = false;
GUI = false; GUI = false;
args = Shift(args, 2); args = Shift(args, 2);
@ -156,6 +162,12 @@ namespace ModAssistant
args = Shift(args, 2); args = Shift(args, 2);
break; break;
case "--runforever":
while (true)
{
}
default: default:
Utils.SendNotify((string)Current.FindResource("App:UnrecognizedArgument")); Utils.SendNotify((string)Current.FindResource("App:UnrecognizedArgument"));
args = Shift(args); args = Shift(args);

View file

@ -103,23 +103,29 @@ namespace ModAssistant.API
BeatSaverRatelimit ratelimit = new BeatSaverRatelimit(); 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(); var Remaining = _remaining.GetEnumerator();
ratelimit.Remaining = Int32.Parse(Remaining.GetEnumerator().Current); 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(); var Reset = _reset.GetEnumerator();
ratelimit.Reset = Int32.Parse(Reset.GetEnumerator().Current); Reset.MoveNext();
ratelimit.Reset = Int32.Parse(Reset.Current);
ratelimit.ResetTime = UnixTimestampToDateTime((long)ratelimit.Reset); 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(); var Total = _total.GetEnumerator();
ratelimit.Total = Int32.Parse(Total.GetEnumerator().Current); Total.MoveNext();
ratelimit.Total = Int32.Parse(Total.Current);
Total.Dispose();
} }
return ratelimit; return ratelimit;