From aa984b6be434a884b9f1b46c120a04bef3d744d4 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Sun, 5 Dec 2021 21:42:26 -0600
Subject: [PATCH] Fixed file open problem

---
 .../new/solarfm/shellfm/windows/view/utils/Launcher.py      | 6 +++---
 .../new/solarfm/signal_classes/mixins/WindowMixin.py        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/Launcher.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/Launcher.py
index 8d7e5f0..0e14606 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/Launcher.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/Launcher.py
@@ -35,16 +35,16 @@ class Launcher:
         else:
             command = ["xdg-open", file]
 
-        self.execute(command)
+        self.execute(command, use_shell=False)
 
 
-    def execute(self, command, start_dir=os.getenv("HOME"), use_os_system=None):
+    def execute(self, command, start_dir=os.getenv("HOME"), use_os_system=None, use_shell=True):
         self.logger.debug(command)
         if use_os_system:
             os.system(command)
         else:
             DEVNULL = open(os.devnull, 'w')
-            subprocess.Popen(command, cwd=start_dir, shell=True, start_new_session=True, stdout=DEVNULL, stderr=DEVNULL, close_fds=True)
+            subprocess.Popen(command, cwd=start_dir, shell=use_shell, start_new_session=True, stdout=DEVNULL, stderr=DEVNULL, close_fds=True)
 
 
     def remux_video(self, hash, file):
diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py
index e486985..83eb9c7 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py
@@ -110,7 +110,7 @@ class WindowMixin(TabMixin):
 
             fileName   = model[item][1]
             dir        = view.get_current_directory()
-            file       = dir + "/" + fileName
+            file       = f"{dir}/{fileName}"
 
             if isdir(file):
                 view.set_path(file)
@@ -120,7 +120,7 @@ class WindowMixin(TabMixin):
                 self.set_file_watcher(view)
                 self.set_bottom_labels(view)
             else:
-                view.open_file_locally(file)
+                self.open_files()
         except Exception as e:
             self.display_message(self.error, f"{repr(e)}")