More changes to make sure R9 hopefully doesn't need a hotfix

torchgm · Sep 22, 2020 · 28f6dfe · 28f6dfe
1 parent a182041
commit 28f6dfe
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/ActiveDesktop/MainWindow.xaml.cs b/ActiveDesktop/MainWindow.xaml.cs
@@ -64,6 +64,7 @@ public MainWindow()
             FileSystem();
 
 
+
             ImmersiveExperiencePage = new ImmersiveExperience();
             ImmersiveFinalisePage = new ImmersiveFinalise();
             CurrentAppsPage = new CurrentApps();
@@ -92,11 +93,20 @@ public MainWindow()
             {
                 ErrorNotif.Visibility = Visibility.Visible;
             }
+
             JSONArrayList = ReadJSON();
             // Trigger a refresh of many things. Not strictly necessary for all of this but hey extra refreshing is always nice
             Displays = GetDisplays();
             RefreshLists();
             DebugRefreshEvent();
+            if (IsRunningAsUWP())
+            {
+                LogEntry("[ADP] Running in UWP mode");
+            }
+            else
+            {
+                LogEntry("[ADP] Running in legacy win32 mode");
+            }
             if (JSONArrayList.Count != 0 && WindowHandles.Count() == 0)
             {
                 StartSavedApps();
@@ -115,14 +125,7 @@ public MainWindow()
             {
                 StartupInit();
             }
-            if (IsRunningAsUWP())
-            {
-                LogEntry("[ADP] Running in UWP mode");
-            }
-            else
-            {
-                LogEntry("[ADP] Running in legacy win32 mode");
-            }
+
 
             CurrentAppsPage.TitleTextBox.Text = "[Hold Ctrl to select an app]";
             CurrentAppsPage.HwndInputTextBox.Text = "";
@@ -317,7 +320,10 @@ public void RefreshLists()
                 }
             }
             SavedListRefreshEvent();
-            StartupInit();
+            if (IsRunningAsUWP())
+            {
+                StartupInit();
+            }
             LogEntry("[ADP] Refreshed in-app lists");
         }
 
@@ -1110,8 +1116,16 @@ private static bool EnumWindow(IntPtr handle, IntPtr pointer)
         // Checks if running as a UWP app
         public bool IsRunningAsUWP()
         {
-            Helpers helpers = new Helpers();
-            return helpers.IsRunningAsUwp();
+            try
+            {
+                Helpers helpers = new Helpers();
+                return helpers.IsRunningAsUwp();
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
         }
 
         // Actually removes the borders