Merge pull request #362 from duke7553/lampenlampen-feat/Terminal

lukeblevins · web-flow · commit 6695eb8e3208 · 2019-12-31T13:40:44.000-05:00
Prevent Startup Crash
diff --git a/Files/App.xaml.cs b/Files/App.xaml.cs
@@ -90,6 +90,7 @@ public App()
             AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));
             localSettings = ApplicationData.Current.LocalSettings;
             SetPropertiesFromLocalSettings();
+            DetectCustomLocations();
             PopulatePinnedSidebarItems();
             DetectWSLDistros();
             QuickLookIntegration();
@@ -342,7 +343,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
`@@ -90,6 +90,7 @@ public App()`
`90`	`90`	`AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));`
`91`	`91`	`localSettings = ApplicationData.Current.LocalSettings;`
`92`	`92`	`SetPropertiesFromLocalSettings();`
	`93`	`+ DetectCustomLocations();`
`93`	`94`	`PopulatePinnedSidebarItems();`
`94`	`95`	`DetectWSLDistros();`
`95`	`96`	`QuickLookIntegration();`
`@@ -342,7 +343,6 @@ private void SetPropertiesFromLocalSettings()`
`342`	`343`	`}`
`343`	`344`
`344`	`345`	`this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;`
`345`		`- DetectCustomLocations();`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`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;`