diff options
| author | George Hazan <george.hazan@gmail.com> | 2025-04-10 18:16:45 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2025-04-10 18:16:45 +0300 |
| commit | 24f1172138e3ddfc50cb79c5eea488af3c834a72 (patch) | |
| tree | 6cc64818bc870f95f11016f1330576ae72db1aeb /src | |
| parent | d5c6af21d737670e4abbdb6521e5c8e3d074fee8 (diff) | |
fixes #4969 (Weather: не работают пункты в главном меню)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/menu_clist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index 55f4c11fee..67d9cff5f7 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -119,13 +119,13 @@ MIR_APP_DLL(HGENMENU) Menu_AddMainMenuItem(TMO_MenuItem *pmi, const char *pszPro return nullptr;
CMStringA szService;
- if (pszProto) {
- szService.Format("/%s/%s", pszProto, pmi->pszService);
- pmi->pszService = szService;
- }
+ if (pszProto)
+ szService.Format("%s%s", pszProto, pmi->pszService);
+ else
+ szService = pmi->pszService;
// we need just one parametr.
- mmep->szServiceName = mir_strdup(pmi->pszService);
+ mmep->szServiceName = mir_strdup(szService);
mmep->szMenuName = pmi->name.w;
TMO_IntMenuItem *pimi = Menu_AddItem(hMainMenuObject, pmi, mmep);
@@ -138,7 +138,7 @@ MIR_APP_DLL(HGENMENU) Menu_AddMainMenuItem(TMO_MenuItem *pmi, const char *pszPro bool needFree = false;
if (pmi->pszService)
- name = pmi->pszService;
+ name = mmep->szServiceName;
else if (pmi->flags & CMIF_UNICODE) {
name = mir_u2a(pmi->name.w);
needFree = true;
|