Code Quality: Fixed ArgumentNullException in ShellViewModel.CheckForBackgroundImage() (#15796)

hishitetsu · web-flow · commit a77620f63a9b · 2024-07-13T22:17:54.000-04:00
diff --git a/src/Files.App/ViewModels/ShellViewModel.cs b/src/Files.App/ViewModels/ShellViewModel.cs
@@ -1738,9 +1738,9 @@ await Task.Run(async () =>
 
 						await OrderFilesAndFoldersAsync();
 						await ApplyFilesAndFoldersChangesAsync();
+						await dispatcherQueue.EnqueueOrInvokeAsync(CheckForSolutionFile, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 						await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 						{
-							CheckForSolutionFile();
 							GetDesktopIniFileData();
 							CheckForBackgroundImage();
 						},
@@ -1813,7 +1813,7 @@ private void GetDesktopIniFileData()
 
 		public void CheckForBackgroundImage()
 		{
-			var filesAppSection = DesktopIni.FirstOrDefault(x => x.SectionName == "FilesApp");
+			var filesAppSection = DesktopIni?.FirstOrDefault(x => x.SectionName == "FilesApp");
 			if (filesAppSection is null || folderSettings.LayoutMode is FolderLayoutModes.ColumnView)
 			{
 				FolderBackgroundImageSource = null;

Original file line number	Diff line number	Diff line change
`@@ -1738,9 +1738,9 @@ await Task.Run(async () =>`
`1738`	`1738`
`1739`	`1739`	`await OrderFilesAndFoldersAsync();`
`1740`	`1740`	`await ApplyFilesAndFoldersChangesAsync();`
	`1741`	`+ await dispatcherQueue.EnqueueOrInvokeAsync(CheckForSolutionFile, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);`
`1741`	`1742`	`await dispatcherQueue.EnqueueOrInvokeAsync(() =>`
`1742`	`1743`	`{`
`1743`		`- CheckForSolutionFile();`
`1744`	`1744`	`GetDesktopIniFileData();`
`1745`	`1745`	`CheckForBackgroundImage();`
`1746`	`1746`	`},`
`@@ -1813,7 +1813,7 @@ private void GetDesktopIniFileData()`
`1813`	`1813`
`1814`	`1814`	`public void CheckForBackgroundImage()`
`1815`	`1815`	`{`
`1816`		`- var filesAppSection = DesktopIni.FirstOrDefault(x => x.SectionName == "FilesApp");`
	`1816`	`+ var filesAppSection = DesktopIni?.FirstOrDefault(x => x.SectionName == "FilesApp");`
`1817`	`1817`	`if (filesAppSection is null \|\| folderSettings.LayoutMode is FolderLayoutModes.ColumnView)`
`1818`	`1818`	`{`
`1819`	`1819`	`FolderBackgroundImageSource = null;`