From 51268ff9f40996e179b611932f61ed5fc5f527c3 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 28 Nov 2019 13:33:56 -0800 Subject: [PATCH] Open share tab if filenames are passed; and when detecting existing onionshare-gui processes, ignore zombies --- onionshare_gui/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/onionshare_gui/__init__.py b/onionshare_gui/__init__.py index 52e609a4..f0186a18 100644 --- a/onionshare_gui/__init__.py +++ b/onionshare_gui/__init__.py @@ -131,7 +131,7 @@ def main(): if proc.info["pid"] == os.getpid(): continue - if proc.info["name"] == "onionshare-gui": + if proc.info["name"] == "onionshare-gui" and proc.status() != "zombie": existing_pid = proc.info["pid"] break else: @@ -140,6 +140,7 @@ def main(): if ( os.path.basename(proc.info["cmdline"][0]).lower() == "python" and os.path.basename(proc.info["cmdline"][1]) == "onionshare-gui" + and proc.status() != "zombie" ): existing_pid = proc.info["pid"] break @@ -161,6 +162,10 @@ def main(): # Launch the gui main_window = MainWindow(common, filenames) + # If filenames were passed in, open them in a tab + if filenames: + main_window.tabs.new_share_tab(filenames) + # Clean up when app quits def shutdown(): main_window.cleanup()