# HG changeset patch
# User unc0rr
# Date 1361471463 -14400
# Node ID 49e657b77499f75974a6f856e9999a759b7ac192
# Parent  92da587691c98216dbc6d51ea3ddb0dc0775f8e4# Parent  11d5903fe6f91a9d6081b0233c9917e4e0860a0e
Merge

diff -r 11d5903fe6f9 -r 49e657b77499 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Thu Feb 21 11:13:00 2013 +0400
+++ b/QTfrontend/hwform.cpp	Thu Feb 21 22:31:03 2013 +0400
@@ -1202,7 +1202,7 @@
     connect(hwnet, SIGNAL(LeftRoom(const QString&)), this, SLOT(NetLeftRoom(const QString&)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(AddNetTeam(const HWTeam&)), this, SLOT(AddNetTeam(const HWTeam&)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(RemoveNetTeam(const HWTeam&)), this, SLOT(RemoveNetTeam(const HWTeam&)), Qt::QueuedConnection);
-    connect(hwnet, SIGNAL(TeamAccepted(const QString&)), this, SLOT(NetTeamAccepted(const QString&)));
+    connect(hwnet, SIGNAL(TeamAccepted(const QString&)), this, SLOT(NetTeamAccepted(const QString&)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(NickRegistered(const QString&)), this, SLOT(NetNickRegistered(const QString&)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(NickNotRegistered(const QString&)), this, SLOT(NetNickNotRegistered(const QString&)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(NickTaken(const QString&)), this, SLOT(NetNickTaken(const QString&)), Qt::QueuedConnection);
@@ -1234,13 +1234,12 @@
             hwnet, SLOT(askRoomsList()));
 
 // room status stuff
-// not queued because creates new signal/slot connection
     connect(hwnet, SIGNAL(roomMaster(bool)),
-            this, SLOT(NetGameChangeStatus(bool)));
+            this, SLOT(NetGameChangeStatus(bool)), Qt::QueuedConnection);
 
 // net page stuff
     connect(hwnet, SIGNAL(roomNameUpdated(const QString &)),
-            ui.pageNetGame, SLOT(setRoomName(const QString &)));
+            ui.pageNetGame, SLOT(setRoomName(const QString &)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(chatStringFromNet(const QString&)),
             ui.pageNetGame->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
 
diff -r 11d5903fe6f9 -r 49e657b77499 QTfrontend/net/newnetclient.cpp
--- a/QTfrontend/net/newnetclient.cpp	Thu Feb 21 11:13:00 2013 +0400
+++ b/QTfrontend/net/newnetclient.cpp	Thu Feb 21 22:31:03 2013 +0400
@@ -63,6 +63,8 @@
     connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
     connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
             SLOT(displayError(QAbstractSocket::SocketError)));
+
+    connect(this, SIGNAL(messageProcessed()), this, SLOT(ClientRead()), Qt::QueuedConnection);
 }
 
 HWNewNet::~HWNewNet()
@@ -186,6 +188,8 @@
         {
             ParseCmd(cmdbuf);
             cmdbuf.clear();
+            emit messageProcessed();
+            return ;
         }
         else
             cmdbuf << s;
diff -r 11d5903fe6f9 -r 49e657b77499 QTfrontend/net/newnetclient.h
--- a/QTfrontend/net/newnetclient.h	Thu Feb 21 11:13:00 2013 +0400
+++ b/QTfrontend/net/newnetclient.h	Thu Feb 21 22:31:03 2013 +0400
@@ -131,6 +131,8 @@
 
         void setMyReadyStatus(bool isReady);
 
+        void messageProcessed();
+
     public slots:
         void ToggleReady();
         void chatLineToNet(const QString& str);
diff -r 11d5903fe6f9 -r 49e657b77499 QTfrontend/ui/widget/themeprompt.cpp
--- a/QTfrontend/ui/widget/themeprompt.cpp	Thu Feb 21 11:13:00 2013 +0400
+++ b/QTfrontend/ui/widget/themeprompt.cpp	Thu Feb 21 22:31:03 2013 +0400
@@ -162,4 +162,4 @@
 {
     filterModel->setFilterFixedString(text);
     list->setCurrentIndex(filterModel->index(0, 0));
-}
\ No newline at end of file
+}