From 1af4404ec3ac1bc9355e6381bdfcac53a15e5121 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Tue, 15 Jun 2010 04:07:19 +0000
Subject: Fixed crash on first start New protocol icon

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@522 4f64403b-2f21-0410-a795-97e2b3489a10
---
 worldtime_protocol/options.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'worldtime_protocol/options.cpp')

diff --git a/worldtime_protocol/options.cpp b/worldtime_protocol/options.cpp
index 32d8ecb..68043d5 100644
--- a/worldtime_protocol/options.cpp
+++ b/worldtime_protocol/options.cpp
@@ -136,17 +136,20 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		bool hide_proto = (DBGetContactSettingByte(NULL, "WorldTime", "HideProtocol", 0) == 1);
 		CheckDlgButton(hwndDlg, IDC_CHK_HIDE, hide_proto ? 1 : 0);
 		DBVARIANT dbv;
-		if(!DBGetContactSettingTString(NULL, "WorldTime", "TimeFormat", &dbv))
+		if(!DBGetContactSettingTString(NULL, "WorldTime", "TimeFormat", &dbv)) {
 			_tcscpy(format_string, dbv.ptszVal);
-		DBFreeVariant(&dbv);
+			DBFreeVariant(&dbv);
+		}
 		SetDlgItemText(hwndDlg, IDC_ED_FORMAT, format_string);
-		if(!DBGetContactSettingTString(NULL, "WorldTime", "DateFormat", &dbv))
+		if(!DBGetContactSettingTString(NULL, "WorldTime", "DateFormat", &dbv)) {
 			_tcscpy(date_format_string, dbv.ptszVal);
-		DBFreeVariant(&dbv);
+			DBFreeVariant(&dbv);
+		}
 		SetDlgItemText(hwndDlg, IDC_ED_DATE_FORMAT, date_format_string);
-		if(!DBGetContactSettingTString(NULL, "WorldTime", "CListFormat", &dbv))
+		if(!DBGetContactSettingTString(NULL, "WorldTime", "CListFormat", &dbv)) {
 			_tcscpy(clist_format_string, dbv.ptszVal);
-		DBFreeVariant(&dbv);
+			DBFreeVariant(&dbv);
+		}
 		SetDlgItemText(hwndDlg, IDC_ED_CLIST_FORMAT, clist_format_string);
 
 		if(!set_format) {
@@ -304,18 +307,18 @@ void LoadOptions() {
 	DBVARIANT dbv;
 	if(!DBGetContactSettingTString(NULL, "WorldTime", "TimeFormat", &dbv)) {
 		_tcsncpy(format_string, dbv.ptszVal, 512);
+		DBFreeVariant(&dbv);
 	} else
 		_tcscpy(format_string, _T("HH:mm"));
-	DBFreeVariant(&dbv);
 	if(!DBGetContactSettingTString(NULL, "WorldTime", "DateFormat", &dbv)) {
 		_tcsncpy(date_format_string, dbv.ptszVal, 512);
+		DBFreeVariant(&dbv);
 	} else
 		_tcscpy(date_format_string, _T("d/M"));
-	DBFreeVariant(&dbv);
 
 	if(!DBGetContactSettingTString(NULL, "WorldTime", "CListFormat", &dbv)) {
 		_tcsncpy(clist_format_string, dbv.ptszVal, 512);
+		DBFreeVariant(&dbv);
 	} else
 		_tcscpy(clist_format_string, _T("%n: %t %d"));
-	DBFreeVariant(&dbv);
 }
-- 
cgit v1.2.3