DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Plugins - Added API versioning

Browse Source 
Tray icon - Fix crash when restoring main window from tray
This commit is contained in:
Robert committed 2022-08-21 10:00:00 +02:00
1 parent a282bf3fd7
commit 9d2136dd6a
3 files changed
+31 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Root/RootViewModel.cs
+9 -3
View File
@@ -127,10 +127,16 @@ namespace Artemis.UI.Screens.Root
public void OpenScreen(string displayName)
{
// The window will open on the UI thread at some point, respond to that to select the chosen screen
MainWindowOpened += OnEventHandler;
OpenMainWindow();
// At this point there is a sidebar VM because the main window was opened
SidebarViewModel!.SelectedSidebarScreen = SidebarViewModel.SidebarScreens.FirstOrDefault(s => s.DisplayName == displayName);
void OnEventHandler(object? sender, EventArgs args)
{
if (SidebarViewModel != null)
SidebarViewModel.SelectedSidebarScreen = SidebarViewModel.SidebarScreens.FirstOrDefault(s => s.DisplayName == displayName);
MainWindowOpened -= OnEventHandler;
}
}
public async Task OpenDebugger()
@@ -167,7 +173,7 @@ namespace Artemis.UI.Screens.Root
_lifeTime.MainWindow.WindowState = WindowState.Normal;
_lifeTime.MainWindow.Activate();
OnMainWindowOpened();
OnMainWindowOpened();
});
}