Merge pull request #813 from troycurtisjr/no-hang-on-exit

Use GLib.spawn_async() for app launching to auto-reap children.

ulauncher/api/shared/action/LaunchAppAction.py

@@ -1,13 +1,16 @@
 import logging
 import os
-import subprocess
 import re
 import shlex
 import shutil
 from pathlib import Path
+import gi
+
+gi.require_version("GLib", "2.0")
+# pylint: disable=wrong-import-position
+from gi.repository import GLib
 
 from ulauncher.utils.desktop.reader import read_desktop_file
-from ulauncher.utils.decorator.run_async import run_async
 from ulauncher.utils.Settings import Settings
 from ulauncher.api.shared.action.BaseAction import BaseAction
 
@@ -16,11 +19,6 @@
 hasSystemdRun = bool(shutil.which("systemd-run"))
 
 
-@run_async
-def wait_for_pid(pid):
-    os.waitpid(pid, 0)
-
-
 class LaunchAppAction(BaseAction):
     """
     Launches app by given `.desktop` file path
@@ -72,8 +70,13 @@ def run(self):
 
             try:
                 logger.info('Run application %s (%s) Exec %s', app.get_name(), self.filename, exec)
-                # Start_new_session is only needed if systemd-run is missing
-                pid = subprocess.Popen(sanitized_exec, env=env, start_new_session=True).pid
-                wait_for_pid(pid)
+                envp = ["{}={}".format(k, v) for k, v in env.items()]
+                GLib.spawn_async(
+                    argv=sanitized_exec,
+                    envp=envp,
+                    flags=GLib.SpawnFlags.SEARCH_PATH_FROM_ENVP | GLib.SpawnFlags.SEARCH_PATH,
+                    # setsid is really only needed if systemd-run is missing, but doesn't hurt to have.
+                    child_setup=os.setsid
+                )
             except Exception as e:
                 logger.error('%s: %s', type(e).__name__, e)