Fix: Ensure app settings are saved when 'shutdown' command is used.

deanthecoder · deanthecoder · commit 26e90c34d718 · 2025-07-17T09:29:40.000+01:00
diff --git a/G33kShell.Desktop/Terminal/Commands/ShutdownCommand.cs b/G33kShell.Desktop/Terminal/Commands/ShutdownCommand.cs
@@ -11,6 +11,8 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Avalonia;
+using DTC.Core.Extensions;
 using G33kShell.Desktop.Terminal.Attributes;
 
 namespace G33kShell.Desktop.Terminal.Commands;
@@ -29,6 +31,8 @@ protected override Task<bool> Run(ITerminalState state)
         {
             FileName = "shutdown", Arguments = $"/s /f /t {delayInSeconds}", CreateNoWindow = true, UseShellExecute = false
         }) != null;
+        if (success)
+            Application.Current.GetMainWindow().Close();
         return Task.FromResult(success);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`using System.Diagnostics;`
`12`	`12`	`using System.Runtime.InteropServices;`
`13`	`13`	`using System.Threading.Tasks;`
	`14`	`+using Avalonia;`
	`15`	`+using DTC.Core.Extensions;`
`14`	`16`	`using G33kShell.Desktop.Terminal.Attributes;`
`15`	`17`
`16`	`18`	`namespace G33kShell.Desktop.Terminal.Commands;`
`@@ -29,6 +31,8 @@ protected override Task<bool> Run(ITerminalState state)`
`29`	`31`	`{`
`30`	`32`	`FileName = "shutdown", Arguments = $"/s /f /t {delayInSeconds}", CreateNoWindow = true, UseShellExecute = false`
`31`	`33`	`}) != null;`
	`34`	`+ if (success)`
	`35`	`+ Application.Current.GetMainWindow().Close();`
`32`	`36`	`return Task.FromResult(success);`
`33`	`37`	`}`
`34`	`38`	`}`