From 10c6934b8ed024e430e605df0027dab65dbb6679 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 2 Apr 2013 18:00:43 -0400 Subject: [PATCH] move isAckDataValid to its own function --- bitmessagemain.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bitmessagemain.py b/bitmessagemain.py index 8b1d9968..92f88e01 100755 --- a/bitmessagemain.py +++ b/bitmessagemain.py @@ -980,7 +980,7 @@ class receiveDataThread(QThread): if ackData[0:4] != '\xe9\xbe\xb4\xd9': print 'Ackdata magic bytes were wrong. Not sending ackData.' return False - ackDataPayloadLength, = unpack('>L',ackData[16:24]) + ackDataPayloadLength, = unpack('>L',ackData[16:20]) if len(ackData)-24 != ackDataPayloadLength: print 'ackData payload length doesn\'t match the payload length specified in the header. Not sending ackdata.' return False @@ -4626,7 +4626,7 @@ class MyForm(QtGui.QMainWindow): printLock.acquire() print 'Closing. Flushing inventory in memory out to disk...' printLock.release() - self.statusBar().showMessage('Flushing inventory in memory out to disk.') + self.statusBar().showMessage('Flushing inventory in memory out to disk. This may take several minutes...') flushInventory() #This one last useless query will guarantee that the previous query committed before we close the program. @@ -4672,7 +4672,6 @@ class MyForm(QtGui.QMainWindow): toAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item(currentInboxRow,0).data(Qt.UserRole).toPyObject()) fromAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item(currentInboxRow,1).data(Qt.UserRole).toPyObject()) - if toAddressAtCurrentInboxRow == '[Broadcast subscribers]': self.ui.labelFrom.setText('') else: