Merge branch 'develop' into codex/packet-auth-policy
This commit is contained in:
@@ -179,7 +179,7 @@ int CannedMessageModule::splitConfiguredMessages()
|
|||||||
while (i < upTo) {
|
while (i < upTo) {
|
||||||
if (this->messageBuffer[i] == '|') {
|
if (this->messageBuffer[i] == '|') {
|
||||||
this->messageBuffer[i] = '\0'; // End previous message
|
this->messageBuffer[i] = '\0'; // End previous message
|
||||||
if (tempCount >= CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT)
|
if (tempCount >= CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT - 1)
|
||||||
break;
|
break;
|
||||||
tempMessages[tempCount++] = (this->messageBuffer + i + 1);
|
tempMessages[tempCount++] = (this->messageBuffer + i + 1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class TouchInkHUDBridge : public Observer<const InputEvent *>
|
|||||||
|
|
||||||
// Check whether a system applet (e.g. menu) is currently handling input
|
// Check whether a system applet (e.g. menu) is currently handling input
|
||||||
bool systemHandlingInput = false;
|
bool systemHandlingInput = false;
|
||||||
for (NicheGraphics::InkHUD::SystemApplet *sa : inkhud->systemApplets) {
|
for (const NicheGraphics::InkHUD::SystemApplet *sa : inkhud->systemApplets) {
|
||||||
if (sa->handleInput) {
|
if (sa->handleInput) {
|
||||||
systemHandlingInput = true;
|
systemHandlingInput = true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user