32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
--- scan/sane.py.orig 2020-10-13 22:29:59.456276307 -0400
|
||
|
|
+++ scan/sane.py 2020-10-13 22:32:44.663586789 -0400
|
||
|
|
@@ -378,14 +378,14 @@
|
||
|
|
|
||
|
|
def isScanActive(self):
|
||
|
|
if self.scan_thread is not None:
|
||
|
|
- return self.scan_thread.isAlive() and self.scan_thread.scan_active
|
||
|
|
+ return self.scan_thread.is_alive() and self.scan_thread.scan_active
|
||
|
|
else:
|
||
|
|
return False
|
||
|
|
|
||
|
|
|
||
|
|
def waitForScanDone(self):
|
||
|
|
if self.scan_thread is not None and \
|
||
|
|
- self.scan_thread.isAlive() and \
|
||
|
|
+ self.scan_thread.is_alive() and \
|
||
|
|
self.scan_thread.scan_active:
|
||
|
|
|
||
|
|
try:
|
||
|
|
@@ -398,9 +398,9 @@
|
||
|
|
#time.sleep(0.5)
|
||
|
|
if self.scan_thread is not None:
|
||
|
|
while True:
|
||
|
|
- #print self.scan_thread.isAlive()
|
||
|
|
+ #print self.scan_thread.is_alive()
|
||
|
|
#print self.scan_thread.scan_active
|
||
|
|
- if self.scan_thread.isAlive() and \
|
||
|
|
+ if self.scan_thread.is_alive() and \
|
||
|
|
self.scan_thread.scan_active:
|
||
|
|
return
|
||
|
|
|