From eab7e3c958371ace5ef30bdb6b27465bb823294f Mon Sep 17 00:00:00 2001
From: Marek Kowalski <marek.kow4@gmail.com>
Date: Sun, 14 May 2017 10:31:34 +0200
Subject: [PATCH] Fixed a bug where the client would crash when the settings
 window on the server opens.

---
 LiveScanServer/SettingsForm.cs        | 7 ++++++-
 src/LiveScanClient/liveScanClient.cpp | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/LiveScanServer/SettingsForm.cs b/LiveScanServer/SettingsForm.cs
index 9fdae90..8bae0b1 100644
--- a/LiveScanServer/SettingsForm.cs
+++ b/LiveScanServer/SettingsForm.cs
@@ -30,6 +30,8 @@ namespace KinectServer
         public KinectSettings oSettings;
         public KinectServer oServer;
 
+        bool bFormLoaded = false;
+
         public SettingsForm()
         {
             InitializeComponent();
@@ -69,11 +71,14 @@ namespace KinectServer
                 rBinaryPly.Checked = false;
                 rAsciiPly.Checked = true;
             }
+
+            bFormLoaded = true;
         }
 
         void UpdateClients()
         {
-            oServer.SendSettings();
+            if (bFormLoaded)
+                oServer.SendSettings();
         }
 
         void UpdateMarkerFields()
diff --git a/src/LiveScanClient/liveScanClient.cpp b/src/LiveScanClient/liveScanClient.cpp
index 74e521e..247694a 100644
--- a/src/LiveScanClient/liveScanClient.cpp
+++ b/src/LiveScanClient/liveScanClient.cpp
@@ -514,6 +514,9 @@ void LiveScanClient::HandleSocket()
 				m_bFrameCompression = true;
 			else
 				m_bFrameCompression = false;
+
+			//so that we do not lose the next character in the stream
+			i--;
 		}
 		//send stored frame
 		else if (received[i] == MSG_REQUEST_STORED_FRAME)