Fix application failing to show if it was started in tray

Author: Iridium-IO

CompactGUI/Application.xaml.vb

@@ -26,15 +26,16 @@ Class Application
         End If
 
         mainWindow = New MainWindow()
-        If e.Args.Length = 1 AndAlso e.Args(0).ToString = "-tray" Then
-            mainWindow.ViewModel.ClosingCommand.Execute(New ComponentModel.CancelEventArgs(True))
-        ElseIf e.Args.Length = 1 Then
-            Await mainWindow.ViewModel.SelectFolderAsync(e.Args(0))
-        End If
+        Dim shouldMinimizeToTray As Boolean = (e.Args.Length = 1 AndAlso e.Args(0).ToString = "-tray") OrElse
+                                          (SettingsHandler.AppSettings.StartInSystemTray AndAlso e.Args.Length = 0)
 
-        If SettingsHandler.AppSettings.StartInSystemTray AndAlso e.Args.Length = 0 Then
+        If shouldMinimizeToTray Then
+            mainWindow.Show()
             mainWindow.ViewModel.ClosingCommand.Execute(New ComponentModel.CancelEventArgs(True))
         Else
+            If e.Args.Length = 1 Then
+                Await mainWindow.ViewModel.SelectFolderAsync(e.Args(0))
+            End If
             mainWindow.Show()
         End If
 

CompactGUI/ViewModels/MainViewModel.TrayHandler.vb

@@ -34,16 +34,18 @@ Partial Public Class MainViewModel
     Private Sub InitialiseNotificationTray()
         ClosingCommand = New RelayCommand(Of CancelEventArgs)(AddressOf Closing)
         NotifyCommand = New RelayCommand(Sub() Notify("Hello", "World"))
-        NotifyIconOpenCommand = New RelayCommand(Sub()
-                                                     Application.Current.MainWindow.Show()
-                                                     WindowState = WindowState.Normal
-                                                     Application.Current.MainWindow.Topmost = True
-                                                     Application.Current.MainWindow.Activate()
-                                                     Application.Current.MainWindow.Topmost = False
-                                                 End Sub)
+        NotifyIconOpenCommand = New RelayCommand(AddressOf NotifyOpen)
         NotifyIconExitCommand = New RelayCommand(AddressOf NotifyExit)
     End Sub
 
+    Private Sub NotifyOpen()
+        Application.Current.MainWindow.Show()
+        WindowState = WindowState.Normal
+        Application.Current.MainWindow.Topmost = True
+        Application.Current.MainWindow.Activate()
+        Application.Current.MainWindow.Topmost = False
+    End Sub
+
     Private Sub NotifyExit()
         If Watcher.WatchedFolders.Count = 0 Then Application.Current.Shutdown()
         Dim res = MessageBox.Show(