Skip to content

Commit

Permalink
Fixed manager.join()
Browse files Browse the repository at this point in the history
  • Loading branch information
apollo13 committed Jan 21, 2017
1 parent 2989419 commit 5797ea3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions circuits/core/manager.py
Expand Up @@ -772,10 +772,10 @@ def start(self, process=False, link=None):
return self.__thread, None

def join(self):
if getattr(self, "_thread", None) is not None:
if self.__thread is not None:
return self.__thread.join()

if getattr(self, "_process", None) is not None:
if self.__process is not None:
return self.__process.join()

def stop(self, code=None):
Expand Down

0 comments on commit 5797ea3

Please sign in to comment.