From d7c1c0d04c8f10ac883c09b809aab9e0b4ad5a69 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Sun, 29 Apr 2018 02:45:56 +0200
Subject: [PATCH] Tor subprocess check separate function

---
 src/Tor/TorManager.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py
index 6f2f7fd0..ac48143d 100644
--- a/src/Tor/TorManager.py
+++ b/src/Tor/TorManager.py
@@ -98,8 +98,7 @@ class TorManager(object):
                     time.sleep(wait * 0.5)
                     self.enabled = True
                     if self.connect():
-                        tor_started = self.tor_process.poll() is None
-                        if tor_started:
+                        if self.isSubprocessRunning():
                             self.request("TAKEOWNERSHIP")  # Shut down Tor client when controll connection closed
                         break
                 # Terminate on exit
@@ -109,11 +108,13 @@ class TorManager(object):
                 self.enabled = False
         return False
 
+    def isSubprocessRunning(self):
+        return self.tor_process and self.tor_process.pid and self.tor_process.poll() is None
+
     def stopTor(self):
         self.log.debug("Stopping...")
         try:
-            tor_started = self.tor_process.poll() is None
-            if tor_started:
+            if self.isSubprocessRunning():
                 self.request("SIGNAL SHUTDOWN")
         except Exception, err:
             self.log.error("Error stopping Tor: %s" % err)