Merge pull request nefarius#634 from Blackmage89/master

Fixed exception on startup when list of profiles is null - issue nefarius#225
SafinWasi · May 25, 2017 · 3d1e926 · 3d1e926
2 parents c6079e6 + 84d625b
commit 3d1e926
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/ScpProfiler/MainWindow.xaml.cs b/ScpProfiler/MainWindow.xaml.cs
@@ -33,7 +33,15 @@ private void Window_Initialized(object sender, EventArgs e)
 
             MainGrid.DataContext = _vm;
 
-            _vm.Profiles = _proxy.GetProfiles().ToList();
+            var list = _proxy.GetProfiles();
+            if (list == null)
+            {
+                list = new List<DualShockProfile>();
+            }
+            else
+            {
+                _vm.Profiles = list.ToList();
+            }
         }
 
         private void ProxyOnNativeFeedReceived(object sender, ScpHidReport report)