From e5cb033463036b182fb6e5e3eed50a14987f5300 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 7 Jun 2015 18:19:34 +0000
Subject: SKINICONDESC -> MAllStrings

git-svn-id: http://svn.miranda-ng.org/main/trunk@14054 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/AutoShutdown/src/utils.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/AutoShutdown/src')

diff --git a/plugins/AutoShutdown/src/utils.cpp b/plugins/AutoShutdown/src/utils.cpp
index 933ca57446..f679d8c3bf 100644
--- a/plugins/AutoShutdown/src/utils.cpp
+++ b/plugins/AutoShutdown/src/utils.cpp
@@ -175,10 +175,10 @@ BOOL GetFormatedCountdown(TCHAR *pszOut,int nSize,time_t countdown)
 			if (pfnGetDurationFormat(locale,0,&st,0,NULL,pszOut,nSize))
 				return TRUE;
 		return FALSE;
-	} else
+	}
+
 	/* Win9x/NT/XP */
-		return StrFromTimeInterval(pszOut,nSize,(countdown>(MAXDWORD/1000))?MAXDWORD:(countdown*1000),10) != 0;
-	return FALSE;
+	return StrFromTimeInterval(pszOut,nSize,(countdown>(MAXDWORD/1000))?MAXDWORD:(countdown*1000),10) != 0;
 }
 
 BOOL GetFormatedDateTime(TCHAR *pszOut,int nSize,time_t timestamp,BOOL fShowDateEvenToday)
@@ -209,11 +209,11 @@ HANDLE IcoLib_AddIconRes(const char *pszDbName,const TCHAR *pszSection,const TCH
 	TCHAR szFileName[MAX_PATH];
 	GetModuleFileName(hInst,szFileName,SIZEOF(szFileName));
 
-	SKINICONDESC sid = { sizeof(sid) };
+	SKINICONDESC sid = { 0 };
 	sid.pszName = (char*)pszDbName;
-	sid.ptszSection = (TCHAR*)pszSection;
-	sid.ptszDescription = (TCHAR*)pszDesc;
-	sid.ptszDefaultFile = szFileName;
+	sid.section.t = (TCHAR*)pszSection;
+	sid.description.t = (TCHAR*)pszDesc;
+	sid.defaultFile.t = szFileName;
 	sid.iDefaultIndex = -idRes;
 	sid.cx = GetSystemMetrics(fLarge?SM_CXICON:SM_CXSMICON);
 	sid.cy = GetSystemMetrics(fLarge?SM_CYICON:SM_CYSMICON);
-- 
cgit v1.2.3