mirror of
https://github.com/storytold/LiveScan3D.git
synced 2026-10-18 07:34:02 +00:00
Fixed a bug where the client would crash when the settings window on the server opens.
This commit is contained in:
@@ -30,6 +30,8 @@ namespace KinectServer
|
|||||||
public KinectSettings oSettings;
|
public KinectSettings oSettings;
|
||||||
public KinectServer oServer;
|
public KinectServer oServer;
|
||||||
|
|
||||||
|
bool bFormLoaded = false;
|
||||||
|
|
||||||
public SettingsForm()
|
public SettingsForm()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -69,11 +71,14 @@ namespace KinectServer
|
|||||||
rBinaryPly.Checked = false;
|
rBinaryPly.Checked = false;
|
||||||
rAsciiPly.Checked = true;
|
rAsciiPly.Checked = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bFormLoaded = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateClients()
|
void UpdateClients()
|
||||||
{
|
{
|
||||||
oServer.SendSettings();
|
if (bFormLoaded)
|
||||||
|
oServer.SendSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateMarkerFields()
|
void UpdateMarkerFields()
|
||||||
|
|||||||
@@ -514,6 +514,9 @@ void LiveScanClient::HandleSocket()
|
|||||||
m_bFrameCompression = true;
|
m_bFrameCompression = true;
|
||||||
else
|
else
|
||||||
m_bFrameCompression = false;
|
m_bFrameCompression = false;
|
||||||
|
|
||||||
|
//so that we do not lose the next character in the stream
|
||||||
|
i--;
|
||||||
}
|
}
|
||||||
//send stored frame
|
//send stored frame
|
||||||
else if (received[i] == MSG_REQUEST_STORED_FRAME)
|
else if (received[i] == MSG_REQUEST_STORED_FRAME)
|
||||||
|
|||||||
Reference in New Issue
Block a user