From 6305f3fc3281beff2f4b65ad8f1a0556a1be8823 Mon Sep 17 00:00:00 2001
From: Ace73 <Ace73Streaming@gmail.com>
Date: Fri, 21 Feb 2025 15:04:17 -0800
Subject: [PATCH] Fixed an issue with launcher freezing on day of scheduled
session
---
.../.gitignore | 0
.../Bobocraft 2 Launcher Update Assistant/App.xaml | 0
.../App.xaml.cs | 0
.../AssemblyInfo.cs | 0
.../Bobocraft 2 Launcher Update Assistant.csproj | 0
.../LauncherBackground.png | Bin
.../MainWindow.xaml | 0
.../MainWindow.xaml.cs | 0
.../bobocraft 2 logo vector.png | Bin
.../discord-mark-blue.png | Bin
.../vector_dizzy.png | Bin
.../GameLauncher.sln | 0
.../GameLauncher/App.config | 0
.../GameLauncher/App.xaml | 0
.../GameLauncher/App.xaml.cs | 0
.../GameLauncher/AssemblyInfo.cs | 0
.../GameLauncher/Bobocraft 2 Launcher.csproj | 0
.../GameLauncher/LauncherBackground.png | Bin
.../GameLauncher/MainWindow.xaml | 0
.../GameLauncher/MainWindow.xaml.cs | 7 ++-----
.../GameLauncher/Properties/Settings.Designer.cs | 0
.../GameLauncher/Properties/Settings.settings | 0
.../GameLauncher/avatar.png | Bin
.../GameLauncher/bobocraft 2 logo vector.png | Bin
.../GameLauncher/discord-mark-blue.png | Bin
.../GameLauncher/images/Icon.ico | Bin
.../GameLauncher/images/LauncherBackground.png | Bin
.../GameLauncher/shape_square.png | Bin
.../GameLauncher/vector_dizzy.png | Bin
.../Licence.txt | 0
.../README.md | 0
.../VisualStudio.gitignore | 0
32 files changed, 2 insertions(+), 5 deletions(-)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/.gitignore (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/App.xaml (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/App.xaml.cs (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/AssemblyInfo.cs (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/Bobocraft 2 Launcher Update Assistant.csproj (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/LauncherBackground.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml.cs (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/bobocraft 2 logo vector.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/discord-mark-blue.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Bobocraft 2 Launcher Update Assistant/vector_dizzy.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher.sln (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/App.config (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/App.xaml (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/App.xaml.cs (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/AssemblyInfo.cs (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/Bobocraft 2 Launcher.csproj (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/LauncherBackground.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/MainWindow.xaml (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/MainWindow.xaml.cs (98%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/Properties/Settings.Designer.cs (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/Properties/Settings.settings (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/avatar.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/bobocraft 2 logo vector.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/discord-mark-blue.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/images/Icon.ico (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/images/LauncherBackground.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/shape_square.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/GameLauncher/vector_dizzy.png (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/Licence.txt (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/README.md (100%)
rename {Bobocraft 2 Launcher v10 fixed countdown => Bobocraft 2 Launcher v11 actually fixed countdown}/VisualStudio.gitignore (100%)
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/.gitignore b/Bobocraft 2 Launcher v11 actually fixed countdown/.gitignore
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/.gitignore
rename to Bobocraft 2 Launcher v11 actually fixed countdown/.gitignore
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml.cs
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/App.xaml.cs
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/AssemblyInfo.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/AssemblyInfo.cs
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/AssemblyInfo.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/AssemblyInfo.cs
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/Bobocraft 2 Launcher Update Assistant.csproj b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/Bobocraft 2 Launcher Update Assistant.csproj
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/Bobocraft 2 Launcher Update Assistant.csproj
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/Bobocraft 2 Launcher Update Assistant.csproj
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/LauncherBackground.png b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/LauncherBackground.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/LauncherBackground.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/LauncherBackground.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml.cs
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/MainWindow.xaml.cs
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/bobocraft 2 logo vector.png b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/bobocraft 2 logo vector.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/bobocraft 2 logo vector.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/bobocraft 2 logo vector.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/discord-mark-blue.png b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/discord-mark-blue.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/discord-mark-blue.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/discord-mark-blue.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/vector_dizzy.png b/Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/vector_dizzy.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Bobocraft 2 Launcher Update Assistant/vector_dizzy.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Bobocraft 2 Launcher Update Assistant/vector_dizzy.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher.sln b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher.sln
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher.sln
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher.sln
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/App.config b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/App.config
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/App.config
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/App.config
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/App.xaml b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/App.xaml
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/App.xaml
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/App.xaml
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/App.xaml.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/App.xaml.cs
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/App.xaml.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/App.xaml.cs
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/AssemblyInfo.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/AssemblyInfo.cs
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/AssemblyInfo.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/AssemblyInfo.cs
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/Bobocraft 2 Launcher.csproj b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/Bobocraft 2 Launcher.csproj
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/Bobocraft 2 Launcher.csproj
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/Bobocraft 2 Launcher.csproj
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/LauncherBackground.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/LauncherBackground.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/LauncherBackground.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/LauncherBackground.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/MainWindow.xaml b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/MainWindow.xaml
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/MainWindow.xaml
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/MainWindow.xaml
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/MainWindow.xaml.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/MainWindow.xaml.cs
similarity index 98%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/MainWindow.xaml.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/MainWindow.xaml.cs
index 38eaa3b..4d3b24e 100644
--- a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/MainWindow.xaml.cs
+++ b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/MainWindow.xaml.cs
@@ -160,17 +160,14 @@ namespace GameLauncher
var timeLeft = NextRC2SessionDateTime - DateTime.Now;
if (timeLeft.TotalSeconds <= 0)
{
- PullSessionTimeFromLink();
- timeLeft = NextRC2SessionDateTime - DateTime.Now;
+ CountdownLabel.Content = "ROBOCRAFT SESSION TODAY!";
}
- CountdownLabel.Content = $"{timeLeft.Days} days {timeLeft.Hours} hours {timeLeft.Minutes} minutes {timeLeft.Seconds} seconds";
+ else { CountdownLabel.Content = $"{timeLeft.Days} days {timeLeft.Hours} hours {timeLeft.Minutes} minutes {timeLeft.Seconds} seconds"; }
});
}
private void PullSessionTimeFromLink()
{
- var currentUTCtime = DateTime.UtcNow;
var Localtimezone = TimeZoneInfo.Local;
- var UTCtimezone = TimeZoneInfo.Utc;
WebClient webClient = new WebClient();
NextSessionString = webClient.DownloadString(NextSessionFileLink);
string format = "M/d/yyyy h:mm:ss tt";
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/Properties/Settings.Designer.cs b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/Properties/Settings.Designer.cs
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/Properties/Settings.Designer.cs
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/Properties/Settings.Designer.cs
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/Properties/Settings.settings b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/Properties/Settings.settings
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/Properties/Settings.settings
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/Properties/Settings.settings
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/avatar.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/avatar.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/avatar.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/avatar.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/bobocraft 2 logo vector.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/bobocraft 2 logo vector.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/bobocraft 2 logo vector.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/bobocraft 2 logo vector.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/discord-mark-blue.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/discord-mark-blue.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/discord-mark-blue.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/discord-mark-blue.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/images/Icon.ico b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/images/Icon.ico
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/images/Icon.ico
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/images/Icon.ico
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/images/LauncherBackground.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/images/LauncherBackground.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/images/LauncherBackground.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/images/LauncherBackground.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/shape_square.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/shape_square.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/shape_square.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/shape_square.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/vector_dizzy.png b/Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/vector_dizzy.png
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/GameLauncher/vector_dizzy.png
rename to Bobocraft 2 Launcher v11 actually fixed countdown/GameLauncher/vector_dizzy.png
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/Licence.txt b/Bobocraft 2 Launcher v11 actually fixed countdown/Licence.txt
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/Licence.txt
rename to Bobocraft 2 Launcher v11 actually fixed countdown/Licence.txt
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/README.md b/Bobocraft 2 Launcher v11 actually fixed countdown/README.md
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/README.md
rename to Bobocraft 2 Launcher v11 actually fixed countdown/README.md
diff --git a/Bobocraft 2 Launcher v10 fixed countdown/VisualStudio.gitignore b/Bobocraft 2 Launcher v11 actually fixed countdown/VisualStudio.gitignore
similarity index 100%
rename from Bobocraft 2 Launcher v10 fixed countdown/VisualStudio.gitignore
rename to Bobocraft 2 Launcher v11 actually fixed countdown/VisualStudio.gitignore