From 0a60af589bd8c254f7a8fbfb00436e0cb4e97e18 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 29 Jun 2025 17:57:18 +0300 Subject: =?UTF-8?q?fixes=20#5059=20(=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B8=20=D1=84?= =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=BF=D0=BE=20=D1=81=D0=BE?= =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BF=D0=BE=D0=B4=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/menu_options.cpp | 3 --- src/mir_app/src/menu_utils.cpp | 18 +----------------- 2 files changed, 1 insertion(+), 20 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp index 4c5bb0e284..dca1eb75dc 100644 --- a/src/mir_app/src/menu_options.cpp +++ b/src/mir_app/src/menu_options.cpp @@ -115,9 +115,6 @@ class CGenMenuOptionsPage : public CDlgBase CMStringW tszValue(FORMAT, L"%d;%d;%S;%s", bChecked, runtimepos, pszParent, ptszCustomName); db_set_ws(0, szModule, menuItemName, tszValue); - - if (pimi->mi.flags & CMIF_CUSTOM) - db_set_s(0, szModule, CMStringA(FORMAT, "Custom%d", customOrder++), menuItemName); } HTREEITEM hChild = m_menuItems.GetChild(tvi.hItem); diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp index 2dad01211a..3c778f926a 100644 --- a/src/mir_app/src/menu_utils.cpp +++ b/src/mir_app/src/menu_utils.cpp @@ -1069,24 +1069,8 @@ static void CALLBACK sttUpdateMenuService() db_set_b(0, szModule, "MenuFormat", true); MO_RecursiveWalkMenu(pmo->m_items, sttDumpItem, szModule); } - else { // yes, menu is already converted, simply load its data - for (int j = 0;; j++) { - char szSetting[100]; - mir_snprintf(szSetting, "Custom%d", j); - ptrA szCustomMenu(db_get_sa(0, szModule, szSetting)); - if (mir_strlen(szCustomMenu) != 32) - break; - - TMO_MenuItem mi = {}; - mi.flags = CMIF_CUSTOM; - mi.name.a = LPGEN("New submenu"); - mi.position = 500050000; - hex2bin(szCustomMenu, &mi.uid, sizeof(MUUID)); - Menu_AddItem(pmo->id, &mi, nullptr); - } - + else // yes, menu is already converted, simply load its data Menu_LoadAllFromDatabase(pmo->m_items, szModule); - } } bMenuLoaded = true; -- cgit v1.2.3