diff options
| author | Szymon Tokarz <wsx22@o2.pl> | 2014-01-10 23:24:27 +0000 |
|---|---|---|
| committer | Szymon Tokarz <wsx22@o2.pl> | 2014-01-10 23:24:27 +0000 |
| commit | 452fb59c22573ddf7939bea02b5e58f4f2e3916c (patch) | |
| tree | 6d61acedfefcf41e784bcdc0e4549d7e8c056e89 /plugins/Clist_modern/src/modern_viewmodebar.cpp | |
| parent | c35cda04b5c43a4af66e4cdb2b1655e34a655f91 (diff) | |
Clist_modern
- Do not execute ModernSkinButtonUnloadModule function twice
- Do not manually free smartpointer
git-svn-id: http://svn.miranda-ng.org/main/trunk@7585 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_viewmodebar.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_viewmodebar.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index fdd9b79130..e4432a5eed 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -443,11 +443,11 @@ void SaveState() if (iLen) {
unsigned int stickies = 0;
- TCHAR *szTempModeName = ( TCHAR* )mir_alloc((iLen + 1)*sizeof(TCHAR));
+ TCHAR *szTempModeName = (TCHAR*)mir_alloc((iLen + 1)*sizeof(TCHAR));
if (szTempModeName) {
SendDlgItemMessage(clvmHwnd, IDC_VIEWMODES, LB_GETTEXT, clvm_curItem, (LPARAM)szTempModeName);
- ptrA szModeName( mir_utf8encodeT(szTempModeName));
+ ptrA szModeName(mir_utf8encodeT(szTempModeName));
DWORD dwGlobalMask = GetMaskForItem(hInfoItem);
for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
@@ -484,11 +484,8 @@ void SaveState() SaveViewMode(szModeName, newGroupFilter, newProtoFilter, statusMask, dwGlobalMask, options,
stickies, operators, lmdat);
- if (szModeName && szModeName != (char*)szTempModeName)
- mir_free(szModeName);
mir_free(szTempModeName);
szTempModeName = NULL;
- szModeName = NULL;
}
}
EnableWindow(GetDlgItem(clvmHwnd, IDC_APPLY), FALSE);
|