Skip to content

Commit

Permalink
Oops (semaphore vs apilock)
Browse files Browse the repository at this point in the history
This reverts commit f89f775.
  • Loading branch information
Willy-JL committed Apr 5, 2024
1 parent 05745ac commit 86dcd78
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
7 changes: 3 additions & 4 deletions applications/services/desktop/desktop.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ static void desktop_loader_callback(const void* message, void* context) {
const LoaderEvent* event = message;

if(event->type == LoaderEventTypeApplicationBeforeLoad) {
desktop->animation_lock = api_lock_alloc_locked();
view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalBeforeAppStarted);
api_lock_wait_unlock_and_free(desktop->animation_lock);
desktop->animation_lock = NULL;
furi_check(furi_semaphore_acquire(desktop->animation_semaphore, 3000) == FuriStatusOk);
} else if(
event->type == LoaderEventTypeApplicationLoadFailed ||
event->type == LoaderEventTypeApplicationStopped) {
Expand Down Expand Up @@ -125,7 +123,7 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
animation_manager_unload_and_stall_animation(desktop->animation_manager);
}
desktop_auto_lock_inhibit(desktop);
api_lock_unlock(desktop->animation_lock);
furi_semaphore_release(desktop->animation_semaphore);
return true;
case DesktopGlobalAfterAppFinished:
animation_manager_load_and_continue_animation(desktop->animation_manager);
Expand Down Expand Up @@ -282,6 +280,7 @@ void desktop_set_stealth_mode_state(Desktop* desktop, bool enabled) {
Desktop* desktop_alloc(void) {
Desktop* desktop = malloc(sizeof(Desktop));

desktop->animation_semaphore = furi_semaphore_alloc(1, 0);
desktop->animation_manager = animation_manager_alloc();
desktop->gui = furi_record_open(RECORD_GUI);
desktop->scene_thread = furi_thread_alloc();
Expand Down
3 changes: 1 addition & 2 deletions applications/services/desktop/desktop_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#include <loader/loader.h>
#include <notification/notification_app.h>
#include <toolbox/api_lock.h>

#define STATUS_BAR_Y_SHIFT 13

Expand Down Expand Up @@ -81,7 +80,7 @@ struct Desktop {

bool in_transition : 1;

FuriApiLock animation_lock;
FuriSemaphore* animation_semaphore;

Keybinds keybinds;

Expand Down

0 comments on commit 86dcd78

Please sign in to comment.