Fix issue 507 (not highlighting friends joins)
authorunc0rr
Sat, 23 Feb 2013 12:01:51 +0400
changeset 8567 a31c453c6070
parent 8564 dadfda4ba248
child 8569 62f4e903fddc
Fix issue #507 (not highlighting friends joins)
QTfrontend/net/newnetclient.cpp
--- a/QTfrontend/net/newnetclient.cpp	Fri Feb 22 21:44:00 2013 -0500
+++ b/QTfrontend/net/newnetclient.cpp	Sat Feb 23 12:01:51 2013 +0400
@@ -490,9 +490,9 @@
                 emit connected();
             }
 
+            m_playersModel->addPlayer(lst[i]);
             emit nickAddedLobby(lst[i], false);
             emit chatStringLobby(lst[i], tr("%1 *** %2 has joined").arg('\x03').arg("|nick|"));
-            m_playersModel->addPlayer(lst[i]);
         }
         return;
     }
@@ -636,9 +636,9 @@
                     emit configAsked();
             }
 
+            m_playersModel->playerJoinedRoom(lst[i]);
             emit nickAdded(lst[i], isChief && (lst[i] != mynick));
             emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
-            m_playersModel->playerJoinedRoom(lst[i]);
         }
         return;
     }