Make onionshare tor process detection work in Windows

1 files changed, 4 insertions, 1 deletions

diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
index 138a6673..1b025bf8 100644
--- a/cli/onionshare_cli/onion.py
+++ b/cli/onionshare_cli/onion.py
@@ -238,7 +238,7 @@ class Onion(object):
 
             # If there is an existing OnionShare tor process, kill it
             for proc in psutil.process_iter(["pid", "name", "username"]):
-                if proc.username() == getpass.getuser():
+                try:
                     cmdline = proc.cmdline()
                     if (
                         cmdline[0] == self.tor_path
@@ -252,6 +252,9 @@ class Onion(object):
                         )
                         proc.terminate()
                         proc.wait()
+                        break
+                except:
+                    pass
 
             if self.common.platform == "Windows" or self.common.platform == "Darwin":
                 # Windows doesn't support unix sockets, so it must use a network port.