From 24f1172138e3ddfc50cb79c5eea488af3c834a72 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 10 Apr 2025 18:16:45 +0300 Subject: =?UTF-8?q?fixes=20#4969=20(Weather:=20=D0=BD=D0=B5=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=82=20=D0=BF=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B2=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D0=BC=20=D0=BC=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_clist.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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; -- cgit v1.2.3