From d77850e44b6d38380c08896ba5f2e043c7c69fb2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 30 Jun 2012 17:45:03 +0000
Subject: mir_free won again!
git-svn-id: http://svn.miranda-ng.org/main/trunk@701 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/StatusPlugins/commonstatus.cpp | 6 ++----
plugins/StatusPlugins/confirmdialog.cpp | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
(limited to 'plugins/StatusPlugins')
diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index d1e214b307..c2cc820e9b 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -335,11 +335,9 @@ static void SetStatusMsg(PROTOCOLSETTINGEX *ps, int newstatus)
TCHAR* szFormattedMsg = variables_parsedup(tszMsg, ps->tszAccName, NULL);
if (szFormattedMsg != NULL) {
- mir_free( tszMsg );
- tszMsg = mir_tstrdup( szFormattedMsg );
- free( szFormattedMsg );
+ mir_free(tszMsg);
+ tszMsg = szFormattedMsg;
}
-
}
log_debugA("CommonStatus sets status message for %s directly", ps->szName);
if ( CALLSERVICE_NOTFOUND == CallProtoService(ps->szName, PS_SETAWAYMSGT, newstatus, (LPARAM)tszMsg )) {
diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp
index f1a2dbf94b..2d93e181fc 100644
--- a/plugins/StatusPlugins/confirmdialog.cpp
+++ b/plugins/StatusPlugins/confirmdialog.cpp
@@ -146,7 +146,7 @@ static int SetStatusList(HWND hwndDlg)
if ( msg != NULL ) {
TCHAR* fMsg = variables_parsedup( msg, confirmSettings[i].tszAccName, NULL );
ListView_SetItemText(hList, lvItem.iItem, 2, fMsg);
- free(fMsg);
+ mir_free(fMsg);
mir_free(msg);
}
else ListView_SetItemText(hList, lvItem.iItem, 2, TranslateT("<n/a>"));
--
cgit v1.2.3