mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 05:06:30 +04:00
Code Issues Activity

[FL-3765][FL-3737] Desktop: ensure that animation is unloaded before app start (#3569)

Browse Source 
* Desktop: ensure that animation is unloaded before app start
* Desktop: unload animation only if it is loaded
This commit is contained in:
Sergei Gavrilov
2024-04-04 22:42:58 +10:00
committed by GitHub
parent 5793d5271c
commit 5431257470
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/services/desktop/desktop.c
View File

@@ -34,10 +34,12 @@ static void desktop_loader_callback(const void* message, void* context) {
if(event->type == LoaderEventTypeApplicationStarted) { if(event->type == LoaderEventTypeApplicationStarted) {
view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalBeforeAppStarted); view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalBeforeAppStarted);
furi_check(furi_semaphore_acquire(desktop->animation_semaphore, 3000) == FuriStatusOk);
} else if(event->type == LoaderEventTypeApplicationStopped) { } else if(event->type == LoaderEventTypeApplicationStopped) {
view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalAfterAppFinished); view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalAfterAppFinished);
} }
} }
static void desktop_lock_icon_draw_callback(Canvas* canvas, void* context) { static void desktop_lock_icon_draw_callback(Canvas* canvas, void* context) {
UNUSED(context); UNUSED(context);
furi_assert(canvas); furi_assert(canvas);
@@ -120,8 +122,11 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
switch(event) { switch(event) {
case DesktopGlobalBeforeAppStarted: case DesktopGlobalBeforeAppStarted:
if(animation_manager_is_animation_loaded(desktop->animation_manager)) {
animation_manager_unload_and_stall_animation(desktop->animation_manager); animation_manager_unload_and_stall_animation(desktop->animation_manager);
}
desktop_auto_lock_inhibit(desktop); desktop_auto_lock_inhibit(desktop);
furi_semaphore_release(desktop->animation_semaphore);
return true; return true;
case DesktopGlobalAfterAppFinished: case DesktopGlobalAfterAppFinished:
animation_manager_load_and_continue_animation(desktop->animation_manager); animation_manager_load_and_continue_animation(desktop->animation_manager);
@@ -270,6 +275,7 @@ void desktop_set_stealth_mode_state(Desktop* desktop, bool enabled) {
Desktop* desktop_alloc(void) { Desktop* desktop_alloc(void) {
Desktop* desktop = malloc(sizeof(Desktop)); Desktop* desktop = malloc(sizeof(Desktop));
desktop->animation_semaphore = furi_semaphore_alloc(1, 0);
desktop->animation_manager = animation_manager_alloc(); desktop->animation_manager = animation_manager_alloc();
desktop->gui = furi_record_open(RECORD_GUI); desktop->gui = furi_record_open(RECORD_GUI);
desktop->scene_thread = furi_thread_alloc(); desktop->scene_thread = furi_thread_alloc();

2
applications/services/desktop/desktop_i.h
View File

@@ -80,6 +80,8 @@ struct Desktop {
bool time_format_12 : 1; // 1 - 12 hour, 0 - 24H bool time_format_12 : 1; // 1 - 12 hour, 0 - 24H
bool in_transition : 1; bool in_transition : 1;
FuriSemaphore* animation_semaphore;
}; };
Desktop* desktop_alloc(void); Desktop* desktop_alloc(void);