[SHARED] Add missing error message if network message parsing fails

8 files changed, 19 insertions, 15 deletions

diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts
index 1b52528..a897589 100644
--- a/i18n/server/pvsmgr_ar_JO.ts
+++ b/i18n/server/pvsmgr_ar_JO.ts
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
         <source>Projection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="758"/>
         <source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index ed36f2d..326374f 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -104,12 +104,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
         <source>Projection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="758"/>
         <source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts
index 2e11a13..09b67f8 100644
--- a/i18n/server/pvsmgr_es_MX.ts
+++ b/i18n/server/pvsmgr_es_MX.ts
@@ -307,12 +307,12 @@ Perform an unprojection or remove remote help to get a target.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
         <source>Projection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="758"/>
         <source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts
index 1b52528..a897589 100644
--- a/i18n/server/pvsmgr_fr_FR.ts
+++ b/i18n/server/pvsmgr_fr_FR.ts
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
         <source>Projection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="758"/>
         <source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts
index 1b52528..a897589 100644
--- a/i18n/server/pvsmgr_pl_PL.ts
+++ b/i18n/server/pvsmgr_pl_PL.ts
@@ -51,12 +51,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="756"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
         <source>Projection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="757"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="758"/>
         <source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 1d9e565..9e89baa 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -724,10 +724,11 @@ void MainWindow::onVncServerStateChange(Client* client)
 		for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it)
 		{
 			Client *c = (**it).client();
-			if (c == NULL)
-				continue; // Offline
-			if (c->id() == client->id() ||
-				(c->desiredProjectionSource() != client->id() && !client->isProjectionSource()))
+			if (c == NULL || c->id() == client->id())
+				continue; // Offline or self
+			if (c->currentProjectionSource() == client->id())
+				continue; // Already watching this client
+			if (c->desiredProjectionSource() != client->id() && !client->isProjectionSource())
 				continue; // Not interested
 			c->sendMessage(msg);
 		}
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 30e323a..fdabb99 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -143,7 +143,7 @@ void Client::handleMsg()
 		qDebug("Received message with empty ID field. ignored.");
 		return;
 	}
-	qDebug() << "Received message " << id;
+	//qDebug() << "Received message " << id;
 
 	if (_authed == 2)
 	{
diff --git a/src/shared/networkmessage.cpp b/src/shared/networkmessage.cpp
index f7972f0..5e15f7b 100644
--- a/src/shared/networkmessage.cpp
+++ b/src/shared/networkmessage.cpp
@@ -113,7 +113,10 @@ bool NetworkMessage::readMessage(QAbstractSocket* socket)
 			const qint64 ret = socket->read(_buffer + _bufferPos, _bufferSize - _bufferPos);
 			//qDebug() << "Read " << ret << " bytes";
 			if (ret < 0)
+			{
+				qDebug("Socket read failed (TCP), return code %d", (int)ret);
 				return false;
+			}
 			_bufferPos += ret;
 			//qDebug() << "Buffer has now " << _bufferPos << " of " << _bufferSize << " bytes";
 		}