Open file with associated program

Prevent opening zip in Explorer
Fix working directory issue

Author: VictoriousRaptor

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -170,6 +170,36 @@ public static void OpenPath(string fileOrFolderPath)
             }
         }
 
+        /// <summary>
+        /// Open a file with associated application
+        /// </summary>
+        /// <param name="filePath">File path</param>
+        /// <param name="workingDir">Working directory</param>
+        /// <param name="asAdmin">Open as Administrator</param>
+        public static void OpenFile(string filePath, string workingDir = "", bool asAdmin = false)
+        {
+            var psi = new ProcessStartInfo
+            {
+                FileName = filePath,
+                UseShellExecute = true,
+                WorkingDirectory = workingDir,
+                Verb = asAdmin ? "runas" : string.Empty
+            };
+            try
+            {
+                if (FileExists(filePath))
+                    Process.Start(psi);
+            }
+            catch (Exception)
+            {
+#if DEBUG
+                throw;
+#else
+                MessageBox.Show(string.Format("Unable to open the path {0}, please check if it exists", filePath));
+#endif
+            }
+        }
+
         ///<summary>
         /// This checks whether a given string is a directory path or network location string. 
         /// It does not check if location actually exists.

Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs

@@ -123,8 +123,8 @@ internal static Result CreateFolderResult(string title, string subtitle, string
                     }
                     else
                     {
-                    // or make this folder the current query
-                    Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder, query.ActionKeyword));
+                        // or make this folder the current query
+                        Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder, query.ActionKeyword));
                     }
 
                     return false;
@@ -255,15 +255,15 @@ internal static Result CreateFileResult(string filePath, Query query, int score
                     {
                         if (c.SpecialKeyState.ToModifierKeys() == (ModifierKeys.Control | ModifierKeys.Shift))
                         {
-                            OpenFileAsAdmin(filePath);
+                            OpenFile(filePath, Settings.UseLocationAsWorkingDir ? Path.GetDirectoryName(filePath) : string.Empty, true);
                         }
                         else if (c.SpecialKeyState.ToModifierKeys() == ModifierKeys.Control)
                         {
                             OpenFolder(filePath, filePath);
                         }
                         else
                         {
-                            OpenFile(filePath);
+                            OpenFile(filePath, Settings.UseLocationAsWorkingDir ? Path.GetDirectoryName(filePath) : string.Empty);
                         }
                     }
                     catch (Exception ex)
@@ -287,10 +287,10 @@ private static bool IsMedia(string extension)
             return MediaExtensions.Contains(extension.ToLowerInvariant());
         }
 
-        private static void OpenFile(string filePath)
+        private static void OpenFile(string filePath, string workingDir = "", bool asAdmin = false)
         {
             IncrementEverythingRunCounterIfNeeded(filePath);
-            FilesFolders.OpenPath(filePath);
+            FilesFolders.OpenFile(filePath, workingDir, asAdmin);
         }
 
         private static void OpenFolder(string folderPath, string fileNameOrFilePath = null)
@@ -299,28 +299,6 @@ private static void OpenFolder(string folderPath, string fileNameOrFilePath = nu
             Context.API.OpenDirectory(folderPath, fileNameOrFilePath);
         }
 
-        private static void OpenFileAsAdmin(string filePath)
-        {
-            _ = Task.Run(() =>
-            {
-                try
-                {
-                    IncrementEverythingRunCounterIfNeeded(filePath);
-                    Process.Start(new ProcessStartInfo
-                    {
-                        FileName = filePath,
-                        UseShellExecute = true,
-                        WorkingDirectory = Settings.UseLocationAsWorkingDir ? Path.GetDirectoryName(filePath) : string.Empty,
-                        Verb = "runas",
-                    });
-                }
-                catch (Exception e)
-                {
-                    MessageBox.Show(e.Message, "Could not start " + filePath);
-                }
-            });
-        }
-
         private static void IncrementEverythingRunCounterIfNeeded(string fileOrFolder)
         {
             if (Settings.EverythingEnabled)