diff options
| author |  Fabio Bas | 2011-08-25 15:10:55 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-08-25 15:10:55 +0000 |
| commit | ad15007fecbd5daaf3f71a1125f5bfb418588f94 (patch) | |
| tree | 3a51446bcc83d9a684488e1512f8a7b437e3b3cd /src | |
| parent | probable fix for #1171 (diff) | |
| download | KVIrc-ad15007fecbd5daaf3f71a1125f5bfb418588f94.tar.gz KVIrc-ad15007fecbd5daaf3f71a1125f5bfb418588f94.tar.bz2 KVIrc-ad15007fecbd5daaf3f71a1125f5bfb418588f94.zip | |
fixed other 2 problems similar to #1171
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5950 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/ui/KviConsoleWindow.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index 7a8abc876..c5e05893f 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -945,8 +945,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) msg->setHaltOutput(); // we don't have a query here! - //if(!KVI_OPTION_STRING(KviOption_stringOnQueryMessageSound).isEmpty() && query!=g_pActiveWindow) - if(!KVI_OPTION_STRING(KviOption_stringOnQueryMessageSound).isEmpty() && console!=g_pActiveWindow) + if(!KVI_OPTION_STRING(KviOption_stringOnQueryMessageSound).isEmpty() && !console->hasAttention()) { // same as above KviKvsVariantList soundParams(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnQueryMessageSound))); diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index c0e613e71..be390fb3c 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -552,7 +552,7 @@ void KviConsoleWindow::closeEvent(QCloseEvent *e) // internal helper for applyHighlighting int KviConsoleWindow::triggerOnHighlight(KviWindow * pWnd, int iType, const QString & szNick, const QString & szUser, const QString & szHost, const QString & szMsg, const QString & szTrigger) { - if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && pWnd != g_pActiveWindow) + if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && pWnd && !pWnd->hasAttention()) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound)))); QString szMessageType = QString("%1").arg(iType); |