more robust handling of message queue
This commit is contained in:
parent
1d349bf8b3
commit
508da57573
10
gameview.py
10
gameview.py
@ -3361,10 +3361,12 @@ class GUI(QtGui.QWidget):
|
|||||||
fShowname = mChatMessage[SHOWNAME]
|
fShowname = mChatMessage[SHOWNAME]
|
||||||
|
|
||||||
if self.messageQueue:
|
if self.messageQueue:
|
||||||
chatMsgComp = decodeAOString(self.messageQueue[0].split('#')[5]).strip()
|
chatMsgComp = decodeAOString(self.messageQueue[0].split('#')[CHATMSG]).strip()
|
||||||
examine = chatMsgComp == ">" or chatMsgComp == "<" or chatMsgComp == "="
|
# This is for servers that support witness testimonies
|
||||||
special = not chatMsgComp
|
examine = chatMsgComp[0] in [">", "<", "="] and (
|
||||||
if examine or (fCharId == self.myChar and (special or mChatMessage[CHATMSG] == chatMsgComp)): # our message showed up
|
len(chatMsgComp) == 1 or chatMsgComp[1:].isdigit()
|
||||||
|
) if chatMsgComp else False
|
||||||
|
if fCharId == self.myChar or examine: # our message showed up
|
||||||
del self.messageQueue[0]
|
del self.messageQueue[0]
|
||||||
self.queueItems.takeItem(0)
|
self.queueItems.takeItem(0)
|
||||||
if self.cbAdditive.isChecked():
|
if self.cbAdditive.isChecked():
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user