diff options
| -rw-r--r-- | include/m_clist.h | 2 | ||||
| -rw-r--r-- | src/modules/clist/clistmenus.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/m_clist.h b/include/m_clist.h index a09e85dd28..5b198fd9b4 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -116,8 +116,6 @@ typedef struct { }
CLISTMENUITEM;
-#define CLISTMENUITEM_OLDSIZE_V1 (offsetof(CLISTMENUITEM,hLangpack))
-
#define HGENMENU_ROOT ((HGENMENU)-1)
#define CMIF_GRAYED 1
diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index a2487c77d3..2de2d14240 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -1129,7 +1129,7 @@ int fnConvertMenu(CLISTMENUITEM* mi, TMO_MenuItem* pmi) if (mi == NULL || pmi == NULL)
return FALSE;
- if (mi->cbSize != sizeof(CLISTMENUITEM) && mi->cbSize != CLISTMENUITEM_OLDSIZE_V1)
+ if (mi->cbSize != sizeof(CLISTMENUITEM))
return FALSE;
memset(pmi, 0, sizeof(TMO_MenuItem));
@@ -1140,9 +1140,7 @@ int fnConvertMenu(CLISTMENUITEM* mi, TMO_MenuItem* pmi) pmi->hotKey = mi->hotKey;
pmi->pszName = mi->pszName;
pmi->position = mi->position;
- if (mi->cbSize == sizeof(CLISTMENUITEM))
- pmi->hLangpack = mi->hLangpack;
-
+ pmi->hLangpack = mi->hLangpack;
return TRUE;
}
|