Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master

This commit is contained in:
Jonathan Warren 2013-05-14 13:09:45 -04:00
commit 05cb526acd

View File

@ -626,6 +626,11 @@ class MyForm(QtGui.QMainWindow):
if not withMessagingMenu: if not withMessagingMenu:
return return
# if there are no items on the messaging menu then
# the subsequent query can be avoided
if not (self.mmapp.has_source("Subscriptions") or self.mmapp.has_source("Messages")):
return
shared.sqlLock.acquire() shared.sqlLock.acquire()
shared.sqlSubmitQueue.put('''SELECT toaddress, read FROM inbox WHERE msgid=?''') shared.sqlSubmitQueue.put('''SELECT toaddress, read FROM inbox WHERE msgid=?''')
shared.sqlSubmitQueue.put(inventoryHash) shared.sqlSubmitQueue.put(inventoryHash)