Fix some other things

pizzaboxer · Sep 5, 2024 · 0d5be93 · 0d5be93
1 parent 2805263
commit 0d5be93
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs
@@ -494,7 +494,7 @@ public static void HandleUpgrade()
  string oldStartPath = Path.Combine(Paths.WindowsStartMenu, "Bloxstrap");
 
  if (File.Exists(oldDesktopPath))
- File.Move(oldDesktopPath, DesktopShortcut);
+ File.Move(oldDesktopPath, DesktopShortcut, true);
 
  if (Directory.Exists(oldStartPath))
  {

diff --git a/Bloxstrap/Integrations/ActivityWatcher.cs b/Bloxstrap/Integrations/ActivityWatcher.cs
@@ -226,7 +226,7 @@ private void ReadLogEntry(string entry)
  {
  var lastActivity = History.First();
 
- if (lastActivity is not null && Data.UniverseId == lastActivity.UniverseId && Data.IsTeleport)
+ if (Data.UniverseId == lastActivity.UniverseId && Data.IsTeleport)
  Data.RootActivity = lastActivity.RootActivity ?? lastActivity;
  }
  }

diff --git a/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs b/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs
@@ -28,6 +28,8 @@ public partial class MenuContainer
 
  private ServerInformation? _serverInformationWindow;
 
+ private ServerHistory? _gameHistoryWindow;
+
  public MenuContainer(Watcher watcher)
  {
  InitializeComponent();
@@ -51,14 +53,14 @@ public void ShowServerInformationWindow()
  {
  if (_serverInformationWindow is null)
  {
- _serverInformationWindow = new ServerInformation(_watcher);
+ _serverInformationWindow = new(_watcher);
  _serverInformationWindow.Closed += (_, _) => _serverInformationWindow = null;
  }
 
  if (!_serverInformationWindow.IsVisible)
- _serverInformationWindow.Show();
-
- _serverInformationWindow.Activate();
+ _serverInformationWindow.ShowDialog();
+ else
+  _serverInformationWindow.Activate();
  }
 
  public void ActivityWatcher_OnLogOpen(object? sender, EventArgs e) => 
@@ -135,7 +137,16 @@ private void JoinLastServerMenuItem_Click(object sender, RoutedEventArgs e)
  if (_activityWatcher is null)
  throw new ArgumentNullException(nameof(_activityWatcher));
 
- new ServerHistory(_activityWatcher).ShowDialog();
+ if (_gameHistoryWindow is null)
+ {
+ _gameHistoryWindow = new(_activityWatcher);
+ _gameHistoryWindow.Closed += (_, _) => _gameHistoryWindow = null;
+ }
+
+ if (!_gameHistoryWindow.IsVisible)
+ _gameHistoryWindow.ShowDialog();
+ else
+ _gameHistoryWindow.Activate();
  }
  }
 }