Skip to content

Commit 8d9e5a3

Browse files
bennr01cclauss
andauthored
Fix wrong merge conflic resolution (NameError)
Thanks @cclauss Co-authored-by: Christian Clauss <cclauss@me.com>
1 parent f882779 commit 8d9e5a3

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

system/shthreads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def status(self):
263263
# True | not None | running
264264
if self.is_alive():
265265
return self.STARTED
266-
elif (not is_alive) and (self.ident is not None):
266+
elif (not self.is_alive()) and (self.ident is not None):
267267
return self.STOPPED
268268
else:
269269
return self.CREATED

0 commit comments

Comments
 (0)