Merge branch 'master' of git.openslx.org:pvs2

3 files changed, 8 insertions, 6 deletions

diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp
index c6ffd8c..54d95bc 100644
--- a/src/client/net/serverconnection.cpp
+++ b/src/client/net/serverconnection.cpp
@@ -379,15 +379,17 @@ void ServerConnection::sock_dataArrival()
 		return;
 	}
 
-	while (_socket->bytesAvailable())
+	while (_socket->bytesAvailable() > 0)
 	{
 		bool retval;
 		retval = _fromServer.readMessage(_socket); // let the message read data from socket
-		if (!retval)   // error parsing msg, disconnect client!
+		if (retval == NM_READ_FAILED)   // error parsing msg, disconnect client!
 		{
 			this->disconnectFromServer();
 			return;
 		}
+		if (retval == NM_READ_INCOMPLETE)
+			return;
 		if (_fromServer.readComplete())   // message is complete
 		{
 			this->handleMsg();
diff --git a/src/client/net/serverdiscovery.cpp b/src/client/net/serverdiscovery.cpp
index 5dba327..1d1e891 100644
--- a/src/client/net/serverdiscovery.cpp
+++ b/src/client/net/serverdiscovery.cpp
@@ -161,7 +161,7 @@ void ServerDiscovery::onUdpReadyRead()
 			continue;
 
 		_packet.reset();
-		if (!_packet.readMessage(data, (quint32)size))
+		if (_packet.readMessage(data, (quint32)size) != NM_READ_OK)
 			continue;
 
 		// Valid packet, process it:
diff --git a/src/client/util/platform/blankscreen_X11.cpp b/src/client/util/platform/blankscreen_X11.cpp
index cee8f03..db8873b 100755
--- a/src/client/util/platform/blankscreen_X11.cpp
+++ b/src/client/util/platform/blankscreen_X11.cpp
@@ -56,7 +56,7 @@ bool BlankScreen::lock(const QString& message)
 
 
     QProcess ungrabP;
-    ungrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/lock.sh");
+    ungrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/kb-lock.sh");
     ungrabP.waitForFinished();
 
 	_locked = true;
@@ -77,9 +77,9 @@ bool BlankScreen::unlock()
 
 	XFlush(_sysdep->dpy);
 
-    /* start the unlock.sh script */
+    /* start the kb-unlock.sh script */
     QProcess regrabP;
-    regrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/unlock.sh");
+    regrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/kb-unlock.sh");
     regrabP.waitForFinished();
 
 	_locked = false;