Browse Source

Fixed about window crashing

Krzysztof Krysiński 2 years ago
parent
commit
66b5ab2f5b

+ 1 - 6
src/PixiEditor/ViewModels/SubViewModels/Main/WindowViewModel.cs

@@ -18,10 +18,6 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
     private CommandController commandController;
     private CommandController commandController;
     private ShortcutPopup? shortcutPopup;
     private ShortcutPopup? shortcutPopup;
     private ShortcutPopup ShortcutPopup => shortcutPopup ??= new(commandController);
     private ShortcutPopup ShortcutPopup => shortcutPopup ??= new(commandController);
-
-    private AboutPopup? _aboutPopup;
-    private AboutPopup AboutPopup => _aboutPopup ??= new();
-
     public RelayCommand<string> ShowAvalonDockWindowCommand { get; set; }
     public RelayCommand<string> ShowAvalonDockWindowCommand { get; set; }
     public ObservableCollection<ViewportWindowViewModel> Viewports { get; } = new();
     public ObservableCollection<ViewportWindowViewModel> Viewports { get; } = new();
     public event EventHandler<ViewportWindowViewModel>? ActiveViewportChanged;
     public event EventHandler<ViewportWindowViewModel>? ActiveViewportChanged;
@@ -165,8 +161,7 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
     [Command.Basic("PixiEditor.Window.OpenAboutWindow", "Open About Window", "Open About Window")]
     [Command.Basic("PixiEditor.Window.OpenAboutWindow", "Open About Window", "Open About Window")]
     public void OpenAboutWindow()
     public void OpenAboutWindow()
     {
     {
-        AboutPopup.Show();
-        AboutPopup.Activate();
+        new AboutPopup().Show();
     }
     }
 
 
     [Command.Basic("PixiEditor.Window.OpenNavigationWindow", "navigation", "Open Navigation Window", "Open Navigation Window")]
     [Command.Basic("PixiEditor.Window.OpenNavigationWindow", "navigation", "Open Navigation Window", "Open Navigation Window")]

+ 0 - 2
src/PixiEditor/Views/Dialogs/AboutPopup.xaml.cs

@@ -12,8 +12,6 @@ public partial class AboutPopup : Window
         InitializeComponent();
         InitializeComponent();
     }
     }
     
     
-    
-    
     private void CommandBinding_CanExecute(object sender, CanExecuteRoutedEventArgs e)
     private void CommandBinding_CanExecute(object sender, CanExecuteRoutedEventArgs e)
     {
     {
         e.CanExecute = true;
         e.CanExecute = true;