Fix crash

Codeusa · Jan 8, 2018 · a3e668c · a3e668c
1 parent 7c338c2
commit a3e668c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/BorderlessGaming.Logic/Core/ProcessWatcher.cs b/BorderlessGaming.Logic/Core/ProcessWatcher.cs
@@ -205,15 +205,26 @@ private void UpdateProcesses()
             }
             Native.QueryProcessesWithWindows(pd =>
             {
-                if (Config.Instance.IsHidden(pd.Proc.ProcessName))
+                try
                 {
-                    return;
+                    if (!string.IsNullOrWhiteSpace(pd?.Proc?.ProcessName))
+                    {
+                        if (Config.Instance.IsHidden(pd?.Proc?.ProcessName))
+                        {
+                            return;
+                        }
+                        if (Processes.Select(p => p.Proc.Id).Contains(pd.Proc.Id) &&
+                            Processes.Select(p => p.WindowTitle).Contains(pd.WindowTitle))
+                        {
+                            return;
+                        }
+                        Processes.Add(pd);
+                        _callback(pd, false);
+                    }
                 }
-                if (!Processes.Select(p => p.Proc.Id).Contains(pd.Proc.Id) ||
-                    !Processes.Select(p => p.WindowTitle).Contains(pd.WindowTitle))
+                catch (Exception)
                 {
-                    Processes.Add(pd);
-                    _callback(pd, false);
+                    _callback(null, false);
                 }
             }, Processes.Where(p => p.WindowHandle != IntPtr.Zero).Select(p => p.WindowHandle).ToList());
         }

diff --git a/BorderlessGaming.Logic/Windows/Security.cs b/BorderlessGaming.Logic/Windows/Security.cs
@@ -36,9 +36,18 @@ public static void SaveConfig(Config instance)
 
         public static Config LoadConfigFile()
         {
-            using (var memoryStream = new MemoryStream(File.ReadAllBytes(AppEnvironment.ConfigPath)))
+            try
             {
-                return Serializer.Deserialize<Config>(memoryStream);
+                using (var memoryStream = new MemoryStream(File.ReadAllBytes(AppEnvironment.ConfigPath)))
+                {
+                    return Serializer.Deserialize<Config>(memoryStream);
+                }
+            }
+            catch (global::System.Exception)
+            {
+                File.Delete(AppEnvironment.ConfigPath);
+                SaveConfig(new Config());
+                return LoadConfigFile();
             }
         }
     }

diff --git a/BorderlessGaming/Forms/MainWindow.cs b/BorderlessGaming/Forms/MainWindow.cs
@@ -208,6 +208,10 @@ private async void fullApplicationRefreshToolStripMenuItem_Click(object sender,
 
         private void HandleProcessChange(ProcessDetails process, bool remove)
         {
+            if (process == null)
+            {
+                return;
+            }
             if (remove)
             {
                 this.PerformSafely(() => lstProcesses.Items.Remove(process));