v0.3.0 #132

Merged
Atheros1 merged 34 commits from master into master 2013-05-06 07:03:38 +02:00
Showing only changes of commit b8f44aadb4 - Show all commits

View File

@ -3850,10 +3850,6 @@ if __name__ == "__main__":
singleCleanerThread = singleCleaner() singleCleanerThread = singleCleaner()
singleCleanerThread.daemon = True # close the main program even if there are threads left singleCleanerThread.daemon = True # close the main program even if there are threads left
singleCleanerThread.start() singleCleanerThread.start()
singleListenerThread = singleListener()
singleListenerThread.daemon = True # close the main program even if there are threads left
singleListenerThread.start()
shared.reloadMyAddressHashes() shared.reloadMyAddressHashes()
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
@ -3888,6 +3884,10 @@ if __name__ == "__main__":
connectToStream(1) connectToStream(1)
singleListenerThread = singleListener()
singleListenerThread.daemon = True # close the main program even if there are threads left
singleListenerThread.start()
if not shared.safeConfigGetBoolean('bitmessagesettings','daemon'): if not shared.safeConfigGetBoolean('bitmessagesettings','daemon'):
try: try:
from PyQt4.QtCore import * from PyQt4.QtCore import *