diff options
| -rw-r--r-- | src/mir_app/src/menu_options.cpp | 3 | ||||
| -rw-r--r-- | src/mir_app/src/menu_utils.cpp | 18 |
2 files changed, 1 insertions, 20 deletions
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;
|