Fix NullReferenceException for some scenarios (#1200)

tsvietOK · web-flow · commit f28bffb83cbf · 2020-06-23T20:43:46.000-04:00
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
@@ -79,6 +79,8 @@ private void AddDefaultLocations()
 
         private async void PopulatePinnedSidebarItems()
         {
+            App.SidebarPinned = new SidebarPinnedModel();
+
             StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;
 
             StorageFile pinnedItemsFile;
diff --git a/Files/Views/InstanceTabsView.xaml.cs b/Files/Views/InstanceTabsView.xaml.cs
@@ -39,7 +39,6 @@ public InstanceTabsView()
             tabView = TabStrip;
 
             App.AppSettings = new SettingsViewModel();
-            App.SidebarPinned = new SidebarPinnedModel();
             App.InteractionViewModel = new InteractionViewModel();
 
             // Turn on Navigation Cache

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ private void AddDefaultLocations()`
`79`	`79`
`80`	`80`	`private async void PopulatePinnedSidebarItems()`
`81`	`81`	`{`
	`82`	`+ App.SidebarPinned = new SidebarPinnedModel();`
	`83`	`+`
`82`	`84`	`StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;`
`83`	`85`
`84`	`86`	`StorageFile pinnedItemsFile;`