summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern/modern_skinopt.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-07-07 10:31:56 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-07-07 10:31:56 +0000
commit767d070330f3fb669495b2e3481f0c8abfcd1300 (patch)
tree7f602995f26ad699be203d535a469a895268e49c /plugins/Clist_modern/modern_skinopt.cpp
parent5ad48842d4520b3f34283c6c48be98ddbe9f23d5 (diff)
- one more crash fix;
- cache functionality fixed; - strange type 'boolean' removed - all header files included into project git-svn-id: http://svn.miranda-ng.org/main/trunk@811 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/modern_skinopt.cpp')
-rw-r--r--plugins/Clist_modern/modern_skinopt.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/Clist_modern/modern_skinopt.cpp b/plugins/Clist_modern/modern_skinopt.cpp
index ef4b1532b8..bfd739edea 100644
--- a/plugins/Clist_modern/modern_skinopt.cpp
+++ b/plugins/Clist_modern/modern_skinopt.cpp
@@ -411,8 +411,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
}
else if ( nmtv->hdr.code == TVN_DELETEITEMA || nmtv->hdr.code == TVN_DELETEITEMW )
{
- if ( nmtv->itemOld.lParam )
- mir_free_and_nil( nmtv->itemOld.lParam );
+ mir_free_and_nil( nmtv->itemOld.lParam );
return 0;
}
break;
@@ -495,7 +494,7 @@ HTREEITEM FillAvailableSkinList( HWND hwndDlg )
CallService( MS_UTILS_PATHTOABSOLUTET, ( WPARAM )skinfile, ( LPARAM )skinfull );
res = AddSkinToListFullName( hwndDlg, skinfull );
- mir_free_and_nil( skinfile );
+ mir_free( skinfile );
}
}
return res;
@@ -658,7 +657,7 @@ HTREEITEM AddItemToTree( HWND hTree, TCHAR * folder, TCHAR * itemName, void * da
}
else
{
- mir_free_and_nil( data ); //need to free otherwise memory leak
+ mir_free( data ); //need to free otherwise memory leak
return cItem;
}
return 0;