Merge pull request #942 from poixen/logic_order
Added () for || && logic handling
This commit is contained in:
commit
fbb7194a10
1 changed files with 1 additions and 1 deletions
|
@ -119,7 +119,7 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
|
|||
|
||||
bool TabMessage::shouldShowSystemPopup(const Event_UserMessage &event) {
|
||||
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) {
|
||||
|
|
Loading…
Reference in a new issue