Fix: Fixed NullReferenceException in DrivesWidgetViewModel.NavigateToPath (#15943)

hishitetsu · web-flow · commit ce338f7aa27e · 2024-08-05T10:51:08.000-04:00
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
@@ -72,8 +72,11 @@ public async Task NavigateToPath(string path)
 				return;
 			}
 
-			ContentPageContext.ShellPage!.NavigateWithArguments(
-				ContentPageContext.ShellPage!.InstanceViewModel.FolderSettings.GetLayoutType(path),
+			if (ContentPageContext.ShellPage is not IShellPage shellPage)
+				return;
+
+			shellPage.NavigateWithArguments(
+				shellPage.InstanceViewModel.FolderSettings.GetLayoutType(path),
 				new() { NavPathParam = path });
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,11 @@ public async Task NavigateToPath(string path)`
`72`	`72`	`return;`
`73`	`73`	`}`
`74`	`74`
`75`		`- ContentPageContext.ShellPage!.NavigateWithArguments(`
`76`		`- ContentPageContext.ShellPage!.InstanceViewModel.FolderSettings.GetLayoutType(path),`
	`75`	`+ if (ContentPageContext.ShellPage is not IShellPage shellPage)`
	`76`	`+ return;`
	`77`	`+`
	`78`	`+ shellPage.NavigateWithArguments(`
	`79`	`+ shellPage.InstanceViewModel.FolderSettings.GetLayoutType(path),`
`77`	`80`	`new() { NavPathParam = path });`
`78`	`81`	`}`
`79`	`82`