Merge remote-tracking branch 'origin/install' into install

FaithBeam · FaithBeam · commit 9e83eba19a75 · 2024-10-20T14:59:23.000-04:00
# Conflicts:
#	YMouseButtonControl.Core/ViewModels/MainWindow/GlobalSettingsDialogViewModel.cs
diff --git a/YMouseButtonControl.Core/ViewModels/MainWindow/GlobalSettingsDialogViewModel.cs b/YMouseButtonControl.Core/ViewModels/MainWindow/GlobalSettingsDialogViewModel.cs
@@ -61,7 +61,7 @@ IThemeService themeService
         );
         var startMenuChanged = this.WhenAnyValue(
             x => x.StartMenuChecked,
-            selector: val => val != startMenuInstallerService.InstallStatus()
+            selector: val => StartMenuEnabled && val != startMenuInstallerService.InstallStatus()
         );
         var themeChanged = this.WhenAnyValue(
             x => x.ThemeSetting.IntValue,
@@ -90,7 +90,10 @@ IThemeService themeService
                     }
                 }
 
-                if (StartMenuChecked != startMenuInstallerService.InstallStatus())
+                if (
+                    StartMenuEnabled
+                    && StartMenuChecked != startMenuInstallerService.InstallStatus()
+                )
                 {
                     if (StartMenuChecked)
                     {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ IThemeService themeService`
`61`	`61`	`);`
`62`	`62`	`var startMenuChanged = this.WhenAnyValue(`
`63`	`63`	`x => x.StartMenuChecked,`
`64`		`- selector: val => val != startMenuInstallerService.InstallStatus()`
	`64`	`+ selector: val => StartMenuEnabled && val != startMenuInstallerService.InstallStatus()`
`65`	`65`	`);`
`66`	`66`	`var themeChanged = this.WhenAnyValue(`
`67`	`67`	`x => x.ThemeSetting.IntValue,`
`@@ -90,7 +90,10 @@ IThemeService themeService`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- if (StartMenuChecked != startMenuInstallerService.InstallStatus())`
	`93`	`+ if (`
	`94`	`+ StartMenuEnabled`
	`95`	`+ && StartMenuChecked != startMenuInstallerService.InstallStatus()`
	`96`	`+ )`
`94`	`97`	`{`
`95`	`98`	`if (StartMenuChecked)`
`96`	`99`	`{`