From f82a19bf906420327e4938a39af02f213c565442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jo=C5=84ski?= Date: Mon, 25 Apr 2022 10:36:34 +0200 Subject: [PATCH] [BH-1463] Bedtime reminder regression fix Bedtime reminder will popup on homescreen again --- .../apps/application-bell-main/ApplicationBellMain.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp index bb06ef7a2e6c0a74e4a194d4eccd02268d81d28d..0b7b1859ab7c0762685be3c8366f909e830287e9 100644 --- a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp +++ b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp @@ -28,6 +28,7 @@ #include #include #include +#include namespace app { @@ -39,8 +40,12 @@ namespace app std::uint32_t stackDepth) : Application(name, parent, statusIndicators, startInBackground, stackDepth) { - getPopupFilter().addAppDependentFilter([&](const gui::PopupRequestParams &) { - return gui::name::window::main_window != getCurrentWindow()->getName(); + getPopupFilter().addAppDependentFilter([&](const gui::PopupRequestParams ¶ms) { + const auto popupId = params.getPopupId(); + if (popupId == gui::popup::ID::Alarm) { + return gui::name::window::main_window != getCurrentWindow()->getName(); + } + return true; }); bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);