projects
/
pierogi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Search for Power Button Panel
[pierogi]
/
protocols
/
aiwaprotocol.cpp
diff --git
a/protocols/aiwaprotocol.cpp
b/protocols/aiwaprotocol.cpp
index
c4dcf6d
..
1a7f60e
100644
(file)
--- a/
protocols/aiwaprotocol.cpp
+++ b/
protocols/aiwaprotocol.cpp
@@
-55,8
+55,11
@@
void AiwaProtocol::startSendingCommand(
// Do we even have this key defined?
if (i == keycodes.end())
{
// Do we even have this key defined?
if (i == keycodes.end())
{
- std::string s = "Tried to send a non-existent command.\n";
- throw PIRException(s);
+ QMutexLocker cifLocker(&commandIFMutex);
+ commandInFlight = false;
+ return;
+// std::string s = "Tried to send a non-existent command.\n";
+// throw PIRException(s);
}
// construct the device:
}
// construct the device:
@@
-88,23
+91,26
@@
void AiwaProtocol::startSendingCommand(
// Check whether we've been asked to stop:
if (checkRepeatFlag())
{
// Check whether we've been asked to stop:
if (checkRepeatFlag())
{
+ break;
+/*
QMutexLocker cifLocker(&commandIFMutex);
commandInFlight = false;
return;
QMutexLocker cifLocker(&commandIFMutex);
commandInFlight = false;
return;
+*/
}
}
++repeatCount;
}
}
}
++repeatCount;
}
+
+ QMutexLocker cifLocker(&commandIFMutex);
+ commandInFlight = false;
}
catch (PIRException e)
{
// inform the gui:
emit commandFailed(e.getError().c_str());
}
}
catch (PIRException e)
{
// inform the gui:
emit commandFailed(e.getError().c_str());
}
-
- QMutexLocker cifLocker(&commandIFMutex);
- commandInFlight = false;
}
}