summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristoph Honal <christoph.honal@web.de>2022-05-10 21:10:10 +0200
committerRiku Isokoski <riksu9000@gmail.com>2022-06-05 09:53:22 +0300
commit03a2059e875bc03919520c4c4febdf80e23f8164 (patch)
tree63328d672e9f99010514cf266484b05f9c948757 /src
parent702f65d3ee1d7d769e153c4bb2637d3598d03e16 (diff)
SystemTask: Use "&&" instead of "and" for operators
As per the coding style, only primary spelling should be used for operators.
Diffstat (limited to 'src')
-rw-r--r--src/systemtask/SystemTask.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index c55288c7..c7e0fc88 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -264,15 +264,16 @@ void SystemTask::Work() {
case Messages::TouchWakeUp: {
if (touchHandler.GetNewTouchInfo()) {
auto gesture = touchHandler.GestureGet();
- if (gesture != Pinetime::Applications::TouchEvents::None and
- ((gesture == Pinetime::Applications::TouchEvents::DoubleTap and
- settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) or
- (gesture == Pinetime::Applications::TouchEvents::Tap and
+ if (gesture != Pinetime::Applications::TouchEvents::None &&
+ ((gesture == Pinetime::Applications::TouchEvents::DoubleTap &&
+ settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) ||
+ (gesture == Pinetime::Applications::TouchEvents::Tap &&
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
GoToRunning();
}
}
- } break;
+ break;
+ }
case Messages::GoToSleep:
if (doNotGoToSleep) {
break;