Restart function fixes

Ruben2776 · Nov 27, 2024 · fc22406 · fc22406
1 parent 873a945
commit fc22406
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/src/PicView.Avalonia/UI/FunctionsHelper.cs b/src/PicView.Avalonia/UI/FunctionsHelper.cs
@@ -140,6 +140,7 @@ public static Task<Func<Task>> GetFunctionByName(string functionName)
             "GalleryClick" => GalleryClick,
             "Slideshow" => Slideshow,
             "ColorPicker" => ColorPicker,
+            "Restart" => Restart,
 
             _ => null
         });
@@ -1046,7 +1047,32 @@ public static async Task ResetSettings()
 
     public static async Task Restart()
     {
-        ProcessHelper.RestartApp(Environment.GetCommandLineArgs()?.ToString());
+        var openFile = string.Empty;
+        var getFromArgs = false;
+        if (Vm?.FileInfo is not null)
+        {
+            if (Vm.FileInfo.Exists)
+            {
+                openFile = Vm.FileInfo.FullName;
+            }
+            else
+            {
+                getFromArgs = true;
+            }
+        }
+        else
+        {
+            getFromArgs = true;
+        }
+        if (getFromArgs)
+        {
+            var args = Environment.GetCommandLineArgs();
+            if (args is not null && args.Length > 0)
+            {
+                openFile = args[1];
+            }
+        }
+        ProcessHelper.RestartApp(openFile);
 
         if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
         {