jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

prevent null crash

Browse source
This commit is contained in:
Zach H 2016-03-15 00:22:23 -04:00
parent cbea43267e
commit 27969b6752
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/tab_room.cpp
View file

@ -160,8 +160,8 @@ void TabRoom::focusTab() {
}
void TabRoom::actShowMentionPopup(QString &sender) {
if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)
|| QApplication::activeWindow() == 0 || QApplication::focusWidget() == 0) {
if (trayIcon && (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this) || QApplication::activeWindow() == 0
|| QApplication::focusWidget() == 0)) {
disconnect(trayIcon, SIGNAL(messageClicked()), 0, 0);
trayIcon->showMessage(sender + tr(" mentioned you."), tr("Click to view"));
connect(trayIcon, SIGNAL(messageClicked()), chatView, SLOT(actMessageClicked()));