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

Merge pull request #2688 from backendr/ignore_first_server_message

Browse source 
Prevent emitting initial server message event
This commit is contained in:
Zach H 2017-05-08 19:46:17 -04:00 committed by GitHub
commit d347e54526
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/tab_server.cpp
View file

@ -168,7 +168,12 @@ void TabServer::retranslateUi()
void TabServer::processServerMessageEvent(const Event_ServerMessage &event) void TabServer::processServerMessageEvent(const Event_ServerMessage &event)
{ {
serverInfoBox->setHtml(QString::fromStdString(event.message())); serverInfoBox->setHtml(QString::fromStdString(event.message()));
emit userEvent(); if (shouldEmitUpdate) {
// prevent the initial server message from taking attention from ping icon
emit userEvent();
} else {
shouldEmitUpdate = true;
}
} }
void TabServer::joinRoom(int id, bool setCurrent) void TabServer::joinRoom(int id, bool setCurrent)

1
cockatrice/src/tab_server.h
View file

@ -47,6 +47,7 @@ private:
AbstractClient *client; AbstractClient *client;
RoomSelector *roomSelector; RoomSelector *roomSelector;
QTextBrowser *serverInfoBox; QTextBrowser *serverInfoBox;
bool shouldEmitUpdate = false;
public: public:
TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent = 0); TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent = 0);
void retranslateUi(); void retranslateUi();