From 6f7b330ad806a9923879229f2a72af0220acd404 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 11 Aug 2024 01:56:06 +0200
Subject: [PATCH] Fix keybinds pointer shenanigans

---
 applications/services/desktop/desktop_keybinds.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/applications/services/desktop/desktop_keybinds.c b/applications/services/desktop/desktop_keybinds.c
index f4d2af883..bbb1f4c13 100644
--- a/applications/services/desktop/desktop_keybinds.c
+++ b/applications/services/desktop/desktop_keybinds.c
@@ -93,7 +93,7 @@ static FuriString*
 
     if(flipper_format_file_open_existing(file, DESKTOP_KEYBINDS_PATH)) {
         FuriString* keybind_name = furi_string_alloc_printf(
-            "%s%s", desktop_keybind_types[type], desktop_keybind_keys[type]);
+            "%s%s", desktop_keybind_types[type], desktop_keybind_keys[key]);
         success = flipper_format_read_string(file, furi_string_get_cstr(keybind_name), keybind);
         furi_string_free(keybind_name);
     }
@@ -109,7 +109,7 @@ static FuriString*
 void desktop_keybinds_load(Desktop* desktop, DesktopKeybinds* keybinds) {
     for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
         for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
-            *keybinds[type][key] = furi_string_alloc_set(desktop_keybinds_defaults[type][key]);
+            (*keybinds)[type][key] = furi_string_alloc_set(desktop_keybinds_defaults[type][key]);
         }
     }
 
@@ -120,10 +120,10 @@ void desktop_keybinds_load(Desktop* desktop, DesktopKeybinds* keybinds) {
         for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
             for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
                 furi_string_printf(
-                    keybind_name, "%s%s", desktop_keybind_types[type], desktop_keybind_keys[type]);
+                    keybind_name, "%s%s", desktop_keybind_types[type], desktop_keybind_keys[key]);
                 if(!flipper_format_read_string(
-                       file, furi_string_get_cstr(keybind_name), *keybinds[type][key])) {
-                    furi_string_set(*keybinds[type][key], desktop_keybinds_defaults[type][key]);
+                       file, furi_string_get_cstr(keybind_name), (*keybinds)[type][key])) {
+                    furi_string_set((*keybinds)[type][key], desktop_keybinds_defaults[type][key]);
                     goto fail;
                 }
             }
@@ -145,11 +145,11 @@ void desktop_keybinds_save(Desktop* desktop, const DesktopKeybinds* keybinds) {
         for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
             for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
                 furi_string_printf(
-                    keybind_name, "%s%s", desktop_keybind_types[type], desktop_keybind_keys[type]);
+                    keybind_name, "%s%s", desktop_keybind_types[type], desktop_keybind_keys[key]);
                 if(!flipper_format_write_string_cstr(
                        file,
                        furi_string_get_cstr(keybind_name),
-                       furi_string_get_cstr(*keybinds[type][key]))) {
+                       furi_string_get_cstr((*keybinds)[type][key]))) {
                     goto fail;
                 }
             }
@@ -166,7 +166,7 @@ void desktop_keybinds_save(Desktop* desktop, const DesktopKeybinds* keybinds) {
 void desktop_keybinds_free(DesktopKeybinds* keybinds) {
     for(DesktopKeybindType type = 0; type < DesktopKeybindTypeMAX; type++) {
         for(DesktopKeybindKey key = 0; key < DesktopKeybindKeyMAX; key++) {
-            furi_string_free(*keybinds[type][key]);
+            furi_string_free((*keybinds)[type][key]);
         }
     }
 }