Translation and other merge requests #224

Merged
Atheros1 merged 47 commits from master into master 2013-06-19 16:55:24 +02:00
Showing only changes of commit 9d7a869cb9 - Show all commits

View File

@ -58,7 +58,8 @@ def _doFastPoW(target, initialHash):
while True: while True:
if shared.shutdown: if shared.shutdown:
pool.terminate() pool.terminate()
pool.join() #Don't return anything (doing so will cause exceptions because we'll return an unusable response). Sit here and wait for this thread to close. while True:
time.sleep(10) # Don't let this thread return here; it will return nothing and cause an exception in bitmessagemain.py
return return
for i in range(pool_size): for i in range(pool_size):
if result[i].ready(): if result[i].ready():