Simplify isReaderActivity bookkeeping

2026-05-06 22:03:57 +02:00
parent e13ba3e180
commit 5bf63e13db
3 changed files with 7 additions and 3 deletions
@@ -7,6 +7,8 @@
 #include <esp_heap_caps.h>
 #include <esp_system.h>

+#include <algorithm>
+
 #include "CrossPointState.h"
 #include "OpdsServerStore.h"
 #include "SdCardFontGlobals.h"
@@ -390,7 +392,11 @@ void ActivityManager::popActivity() {

 bool ActivityManager::preventAutoSleep() const { return currentActivity && currentActivity->preventAutoSleep(); }

-bool ActivityManager::isReaderActivity() const { return currentActivity && currentActivity->isReaderActivity(); }
+bool ActivityManager::isReaderActivity() const {
+  if (currentActivity && currentActivity->isReaderActivity()) return true;
+  return std::any_of(stackActivities.begin(), stackActivities.end(),
+                     [](const auto& activity) { return activity->isReaderActivity(); });
+}

 bool ActivityManager::skipLoopDelay() const { return currentActivity && currentActivity->skipLoopDelay(); }