Fixed spreading over tabs not spamming too much

Now announcements will only get displayed on the current tab + on the local tab

Reviewed-by: Thorbjørn Lindeijer

1 files changed, 4 insertions, 16 deletions

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 0bf8d493..cc09d19e 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -406,22 +406,10 @@ void ChatWindow::event(Event::Channel channel, const Event &event)
         {
             // Show on local tab
             localChatTab->chatLog(event.getString("message"), BY_GM);
-            // Spread over channels
-            for (std::list<Channel*>::iterator
-                 it = channelManager->mChannels.begin(),
-                 it_end = channelManager->mChannels.end();
-                 it != it_end; ++it)
-            {
-                if (*it)
-                    (*it)->getTab()->chatLog(event.getString("message"), BY_GM);
-            }
-            // Spread over whispers
-            for (TabMap::const_iterator it = mWhispers.begin(),
-                 it_end = mWhispers.end(); it != it_end; ++it)
-            {
-                if (it->second)
-                    it->second->chatLog(event.getString("message"), BY_GM);
-            }
+            // Show on selected tab if it is not the global one
+            ChatTab *selected = getFocused();
+            if (selected && selected != localChatTab)
+                selected->chatLog(event.getString("message"), BY_GM);
         }
         else if (event.getType() == Event::Being)
         {