Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-19 04:44:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dialogs: move api lock to toolbox

Browse Source
This commit is contained in:
SG
2022-11-12 08:14:11 +10:00
parent 861f47dd8d
commit 61adff99b7
7 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
applications/services/dialogs/dialogs_module_message.c
View File

@@ -1,5 +1,5 @@
#include "dialogs_i.h"
#include "dialogs_api_lock.h"
#include <toolbox/api_lock.h>
#include <gui/modules/dialog_ex.h>
typedef struct {
@@ -30,7 +30,7 @@ static void dialogs_app_message_back_callback(void* context) {
furi_assert(context);
DialogsAppMessageContext* message_context = context;
message_context->result = DialogMessageButtonBack;
API_LOCK_UNLOCK(message_context->lock);
api_lock_unlock(message_context->lock);
}
static void dialogs_app_message_callback(DialogExResult result, void* context) {
@@ -49,7 +49,7 @@ static void dialogs_app_message_callback(DialogExResult result, void* context) {
default:
break;
}
API_LOCK_UNLOCK(message_context->lock);
api_lock_unlock(message_context->lock);
}
DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDataDialog* data) {
@@ -57,7 +57,7 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
Gui* gui = furi_record_open(RECORD_GUI);
const DialogMessage* message = data->message;
DialogsAppMessageContext* message_context = malloc(sizeof(DialogsAppMessageContext));
message_context->lock = API_LOCK_INIT_LOCKED();
message_context->lock = api_lock_alloc_locked();
ViewHolder* view_holder = view_holder_alloc();
view_holder_attach_to_gui(view_holder, gui);
@@ -87,14 +87,14 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
view_holder_set_view(view_holder, dialog_ex_get_view(dialog_ex));
view_holder_start(view_holder);
API_LOCK_WAIT_UNTIL_UNLOCK(message_context->lock);
api_lock_wait_unlock(message_context->lock);
ret = message_context->result;
view_holder_stop(view_holder);
view_holder_free(view_holder);
dialog_ex_free(dialog_ex);
API_LOCK_FREE(message_context->lock);
api_lock_free(message_context->lock);
free(message_context);
furi_record_close(RECORD_GUI);