sigonasr2/SMX_PGE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure we call the callback from SendCommandLocked if the device isn't connected and we're not queueing the command.

Browse Source
This commit is contained in:
Glenn Maynard 2018-11-08 19:02:39 -06:00
parent 159a9a4da2
commit 880774f9e4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sdk/Windows/SMXDevice.cpp
View File

@ -111,15 +111,20 @@ void SMX::SMXDevice::SendCommandLocked(string cmd, function<void()> pComplete)
{ {
m_Lock.AssertLockedByCurrentThread(); m_Lock.AssertLockedByCurrentThread();
// This call is nonblocking, so it's safe to do this in the UI thread. if(!m_pConnection->IsConnected())
if(m_pConnection->IsConnected())
{ {
m_pConnection->SendCommand(cmd, pComplete); // If we're not connected, just call pComplete.
if(pComplete)
// Wake up the communications thread to send the message. pComplete();
if(m_hEvent) return;
SetEvent(m_hEvent->value());
} }
// This call is nonblocking, so it's safe to do this in the UI thread.
m_pConnection->SendCommand(cmd, pComplete);
// Wake up the communications thread to send the message.
if(m_hEvent)
SetEvent(m_hEvent->value());
} }
void SMX::SMXDevice::GetInfo(SMXInfo &info) void SMX::SMXDevice::GetInfo(SMXInfo &info)