aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #942 from poixen/logic_order

Browse source 
Added () for || && logic handling
This commit is contained in:
poixen 2015-04-10 15:01:28 +02:00
commit fbb7194a10
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/tab_message.cpp
View file

@ -119,7 +119,7 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
bool TabMessage::shouldShowSystemPopup(const Event_UserMessage &event) { bool TabMessage::shouldShowSystemPopup(const Event_UserMessage &event) {
return (QApplication::activeWindow() == 0 || QApplication::focusWidget() == 0 || return (QApplication::activeWindow() == 0 || QApplication::focusWidget() == 0 ||
event.sender_name() == otherUserInfo->name() && tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)); (event.sender_name() == otherUserInfo->name() && tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)));
} }
void TabMessage::showSystemPopup(const Event_UserMessage &event) { void TabMessage::showSystemPopup(const Event_UserMessage &event) {