diff options
Diffstat (limited to 'src/modules/clist/genmenu.cpp')
| -rw-r--r-- | src/modules/clist/genmenu.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index 9395bb1588..c6413ee556 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -1062,14 +1062,9 @@ static int MO_RegisterIcon( PMO_IntMenuItem pmi, void* ) char *uname, *descr;
uname = pmi->UniqName;
if ( uname == NULL )
- #ifdef UNICODE
- uname = mir_u2a(pmi->CustomName);
- descr = mir_u2a(pmi->mi.ptszName);
- #else
- uname = pmi->CustomName;
- descr = pmi->mi.pszName;
- #endif
-
+ uname = mir_u2a(pmi->CustomName);
+ descr = mir_u2a(pmi->mi.ptszName);
+
if ( !uname && !descr )
return FALSE;
@@ -1110,11 +1105,11 @@ static int MO_RegisterIcon( PMO_IntMenuItem pmi, void* ) IconLib_ReleaseIcon( hIcon, 0 );
} }
- #ifdef UNICODE
+
if ( !pmi->UniqName )
mir_free( uname );
mir_free( descr );
- #endif
+
return FALSE;
}
|