From e2028eb731e69c62d5160c0570fac54f8a2bc8f4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 17 Jul 2023 22:12:34 +0300
Subject: [PATCH] Fix menu

---
 applications/main/subghz/application.fam   |  2 +-
 applications/services/loader/loader_menu.c | 36 ++++++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
index 946891a4a..7494e6fba 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -16,7 +16,7 @@ App(
     ],
     icon="A_Sub1ghz_14",
     stack_size=3 * 1024,
-    order=10,
+    order=1,
     fap_libs=["assets", "hwdrivers"],
     fap_icon="icon.png",
     fap_category="Sub-GHz",
diff --git a/applications/services/loader/loader_menu.c b/applications/services/loader/loader_menu.c
index 149fea72c..8277b6db0 100644
--- a/applications/services/loader/loader_menu.c
+++ b/applications/services/loader/loader_menu.c
@@ -94,7 +94,25 @@ static uint32_t loader_menu_exit(void* context) {
 }
 
 static void loader_menu_build_menu(LoaderMenuApp* app, LoaderMenu* menu) {
-    size_t i;
+    size_t i = 0;
+
+    menu_add_item(
+        app->primary_menu,
+        LOADER_APPLICATIONS_NAME,
+        &A_Plugins_14,
+        i++,
+        loader_menu_applications_callback,
+        (void*)menu);
+
+    for(i = 0; i < FLIPPER_APPS_COUNT; i++) {
+        menu_add_item(
+            app->primary_menu,
+            FLIPPER_APPS[i].name,
+            FLIPPER_APPS[i].icon,
+            i,
+            loader_menu_apps_callback,
+            (void*)menu);
+    }
 
     for(i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
         menu_add_item(
@@ -106,24 +124,8 @@ static void loader_menu_build_menu(LoaderMenuApp* app, LoaderMenu* menu) {
             (void*)menu);
     }
 
-    for(i = 0; i < FLIPPER_APPS_COUNT; i++) {
-        menu_add_item(
-            app->primary_menu,
-            FLIPPER_APPS[i].name,
-            FLIPPER_APPS[i].icon,
-            i,
-            loader_menu_apps_callback,
-            (void*)menu);
-    }
     menu_add_item(
         app->primary_menu, "Settings", &A_Settings_14, i++, loader_menu_switch_to_settings, app);
-    menu_add_item(
-        app->primary_menu,
-        LOADER_APPLICATIONS_NAME,
-        &A_Plugins_14,
-        i++,
-        loader_menu_applications_callback,
-        (void*)menu);
 };
 
 static void loader_menu_build_submenu(LoaderMenuApp* app, LoaderMenu* loader_menu) {