Prevent Startup Crash

lukeblevins · lukeblevins · commit 5a0744a7d419 · 2019-12-31T13:44:52.000-05:00
diff --git a/Files/App.xaml.cs b/Files/App.xaml.cs
@@ -84,6 +84,7 @@ public App()
             AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));
             localSettings = ApplicationData.Current.LocalSettings;
             SetPropertiesFromLocalSettings();
+            DetectCustomLocations();
             PopulatePinnedSidebarItems();
             DetectWSLDistros();
             QuickLookIntegration();
@@ -311,7 +312,6 @@ private void SetPropertiesFromLocalSettings()
             }
 
             this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;
-            DetectCustomLocations();
         }
 
         private async void DetectCustomLocations()
diff --git a/Files/Navigation/UniversalPath.cs b/Files/Navigation/UniversalPath.cs
@@ -17,8 +17,11 @@ public string path
 
             set
             {
-                _path = value;
-                NotifyPropertyChanged("path");
+                if(value != null)
+                {
+                    _path = value;
+                    NotifyPropertyChanged("path");
+                }
             }
         }
         public event PropertyChangedEventHandler PropertyChanged;

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public App()`
`84`	`84`	`AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));`
`85`	`85`	`localSettings = ApplicationData.Current.LocalSettings;`
`86`	`86`	`SetPropertiesFromLocalSettings();`
	`87`	`+ DetectCustomLocations();`
`87`	`88`	`PopulatePinnedSidebarItems();`
`88`	`89`	`DetectWSLDistros();`
`89`	`90`	`QuickLookIntegration();`
`@@ -311,7 +312,6 @@ private void SetPropertiesFromLocalSettings()`
`311`	`312`	`}`
`312`	`313`
`313`	`314`	`this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;`
`314`		`- DetectCustomLocations();`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`private async void DetectCustomLocations()`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,11 @@ public string path`
`17`	`17`
`18`	`18`	`set`
`19`	`19`	`{`
`20`		`- _path = value;`
`21`		`- NotifyPropertyChanged("path");`
	`20`	`+ if(value != null)`
	`21`	`+ {`
	`22`	`+ _path = value;`
	`23`	`+ NotifyPropertyChanged("path");`
	`24`	`+ }`
`22`	`25`	`}`
`23`	`26`	`}`
`24`	`27`	`public event PropertyChangedEventHandler PropertyChanged;`