summaryrefslogtreecommitdiff
path: root/plugins/Modernb/modern_clistopts.cpp
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-14 11:13:37 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-14 11:13:37 +0000
commit721aea0764451e985d575236205808bbef298244 (patch)
tree3a1c566c364e5fc2fff86b87d494497e7de6f93d /plugins/Modernb/modern_clistopts.cpp
parent1784cdf49b8196219563795cf3b11b7c4c2a6746 (diff)
one more "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Modernb/modern_clistopts.cpp')
-rw-r--r--plugins/Modernb/modern_clistopts.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/plugins/Modernb/modern_clistopts.cpp b/plugins/Modernb/modern_clistopts.cpp
index 482f6a3a5b..07092018a0 100644
--- a/plugins/Modernb/modern_clistopts.cpp
+++ b/plugins/Modernb/modern_clistopts.cpp
@@ -1231,7 +1231,7 @@ int ReserveExtraSlot(WPARAM wParam,LPARAM lParam)
{
OrderTreeData[iLastFree].fReserved=TRUE;
OrderTreeData[iLastFree].KeyName=pESINFO->pszSlotID;
-#ifdef UNICODE
+
if (pESINFO->fUnicode)
OrderTreeData[iLastFree].Name=pESINFO->ptszSlotName;
else
@@ -1239,16 +1239,7 @@ int ReserveExtraSlot(WPARAM wParam,LPARAM lParam)
OrderTreeData[iLastFree].Name=mir_a2u(pESINFO->pszSlotName); //potential memory leak but should not be more than once
OrderTreeData[iLastFree].fReserved=(BOOL)2; //need to free KeyName
}
-#else
- if (pESINFO->fUnicode)
- {
- OrderTreeData[iLastFree].Name=mir_u2a(pESINFO->pszSlotName); //potential memory leak but should not be more than once
- OrderTreeData[iLastFree].fReserved=(BOOL)2; //need to free KeyName
- }
- else
- OrderTreeData[iLastFree].Name=pESINFO->pszSlotName;
-#endif
- }
+ }
else return -1; // Already reserved
}
return iLastFree;