Merge pull request #2072 from meshtastic/hotfix-01

Hotfix for user button not working
2025-12-21 10:12:50 +00:00 · 2022-12-29 06:22:58 -06:00 · 2022-12-29 11:55:19 +01:00 · 2022-12-28 23:18:19 +01:00 · 2022-12-28 21:27:27 +00:00
2 changed files with 2 additions and 2 deletions
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1072,7 +1072,7 @@ int32_t Screen::runOnce()
            break;
        case Cmd::ON_PRESS:
            // If a nag notification is running, stop it
-            if (externalNotificationModule->nagCycleCutoff != UINT32_MAX) {
+            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
                externalNotificationModule->stopNow();
            } else {
                // Don't advance the screen if we just wanted to switch off the nag notification
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 0
-build = 9
+build = 10
Author	SHA1	Message	Date
Ben Meadors	e09b12ca58	Merge pull request #2072 from meshtastic/hotfix-01 Hotfix for user button not working	2022-12-29 06:22:58 -06:00
Thomas Göttgens	7f3a624ee3	Hotfix for user button not working	2022-12-29 11:55:19 +01:00
Thomas Göttgens	475c87b0e4	Merge pull request #2071 from meshtastic/create-pull-request/patch Changes by create-pull-request action	2022-12-28 23:18:19 +01:00
thebentern	541f4aa998	[create-pull-request] automated change	2022-12-28 21:27:27 +00:00