Merge branch 'Flipper-XFW:dev' into dev

UjhhgtgTeams · Sep 30, 2023 · 6b9f163 · 6b9f163
2 parents c47b1e9 + 91f3ed1
commit 6b9f163
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/applications/services/loader/loader_cli.c b/applications/services/loader/loader_cli.c
@@ -2,6 +2,7 @@
 #include <cli/cli.h>
 #include <applications.h>
 #include <lib/toolbox/args.h>
+#include <notification/notification_messages.h>
 #include "loader.h"
 
 static void loader_cli_print_usage() {
@@ -53,6 +54,9 @@ static void loader_cli_open(FuriString* args, Loader* loader) {
 
         const char* app_name_str = furi_string_get_cstr(app_name);
 
+        NotificationApp* notifications = furi_record_open(RECORD_NOTIFICATION);
+        notification_message_block(notifications, &sequence_display_backlight_on);
+
         FuriString* error_message = furi_string_alloc();
         if(loader_start(loader, app_name_str, args_str, error_message) != LoaderStatusOk) {
             printf("%s\r\n", furi_string_get_cstr(error_message));

diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c
@@ -453,8 +453,11 @@ static bool notification_load_settings(NotificationApp* app) {
 static void input_event_callback(const void* value, void* context) {
     furi_assert(value);
     furi_assert(context);
+    const InputEvent* event = value;
     NotificationApp* app = context;
-    notification_message(app, &sequence_display_backlight_on);
+    if(event->sequence_source == INPUT_SEQUENCE_SOURCE_HARDWARE) {
+        notification_message(app, &sequence_display_backlight_on);
+    }
 }
 
 // App alloc