From 93ba60da690c33172f69fc95487e8fed56a36e29 Mon Sep 17 00:00:00 2001
From: Thomas Herrmann <mail@thoherr.de>
Date: Fri, 23 Feb 2024 22:11:53 +0100
Subject: [PATCH] only acquire screen when paxcounter is active, i.e. enabled
 and wifi and ble are both off

---
 src/modules/esp32/PaxcounterModule.cpp | 2 +-
 src/modules/esp32/PaxcounterModule.h   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/esp32/PaxcounterModule.cpp b/src/modules/esp32/PaxcounterModule.cpp
index 98c5d7b38..d24045719 100644
--- a/src/modules/esp32/PaxcounterModule.cpp
+++ b/src/modules/esp32/PaxcounterModule.cpp
@@ -57,7 +57,7 @@ meshtastic_MeshPacket *PaxcounterModule::allocReply()
 
 int32_t PaxcounterModule::runOnce()
 {
-    if (moduleConfig.paxcounter.enabled && !config.bluetooth.enabled && !config.network.wifi_enabled) {
+    if (isActive()) {
         if (firstTime) {
             firstTime = false;
             LOG_DEBUG(
diff --git a/src/modules/esp32/PaxcounterModule.h b/src/modules/esp32/PaxcounterModule.h
index 7f741430b..437d3f02a 100644
--- a/src/modules/esp32/PaxcounterModule.h
+++ b/src/modules/esp32/PaxcounterModule.h
@@ -23,7 +23,9 @@ class PaxcounterModule : private concurrency::OSThread, public ProtobufModule<me
     bool sendInfo(NodeNum dest = NODENUM_BROADCAST);
     virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Paxcount *p) override;
     virtual meshtastic_MeshPacket *allocReply() override;
-    virtual bool wantUIFrame() override { return true; }
+    bool isActive() { return moduleConfig.paxcounter.enabled &&
+                               !config.bluetooth.enabled && !config.network.wifi_enabled; }
+    virtual bool wantUIFrame() override { return isActive(); }
     virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
 };