From c85beefd3a445d56a59c3b38426cec3986746446 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Fri, 3 Dec 2010 05:42:39 +0000
Subject: Fixed Updates in some cases

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@579 4f64403b-2f21-0410-a795-97e2b3489a10
---
 updater/services.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'updater/services.cpp')

diff --git a/updater/services.cpp b/updater/services.cpp
index e64e8da..3d6fcd7 100644
--- a/updater/services.cpp
+++ b/updater/services.cpp
@@ -32,7 +32,7 @@ bool DownloadUpdates(UpdateList &todo, FilenameMap *map, bool dlls_only) {
 	
 	// iterate through the updates we need to check
 
-	if(use_popup) 
+	if (use_popup) 
 	{
 		ShowPopup(0, TranslateT("Downloading Updates"), _T(""), POPFLAG_SAVEHWND, -1);
 	} 
@@ -123,7 +123,7 @@ bool DownloadUpdates(UpdateList &todo, FilenameMap *map, bool dlls_only) {
 	}
 	
 
-	if (!use_popup && hwndProgress) ProgressWindowDone();
+	ProgressWindowDone();
 	// postmessage here causes a lockup on exit! bah popups!!
 	//if(hwndPop) PostMessage(hwndPop, WMU_CLOSEPOP, 0, 0);
 	if (hwndPop) SendMessage(hwndPop, WMU_CLOSEPOP, 0, 0);
@@ -208,7 +208,7 @@ void CheckForUpdatesWorker(void *param) {
 		CreateProgressWindow();
 
 		PostMessage(hwndProgress, WM_SETTEXT, 0, (LPARAM)TranslateT("Progress - Checking for updates..."));
-		if(options.use_xml_backend) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Downloading XML data"), 0);
+		if (options.use_xml_backend) PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Downloading XML data"), 0);
 		else PostMessage(hwndProgress, WMU_SETMESSAGE, (WPARAM)TranslateT("Checking for updates"), 0);
 
 	}
@@ -282,7 +282,7 @@ void CheckForUpdatesWorker(void *param) {
 		}
 	}
 
-	if (!use_popup && hwndProgress) ProgressWindowDone();
+	ProgressWindowDone();
 	if (hwndPop) PostMessage(hwndPop, WMU_CLOSEPOP, 0 , 0);
 	
 	if(options.use_xml_backend) {
@@ -382,8 +382,7 @@ void CheckForUpdatesWorker(void *param) {
 	} 
 	else if (!restart) 
 	{
-		HWND hWndMiranda = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);
-		PostMessage(hWndMiranda, WM_COMMAND, ID_ICQ_EXIT, 0);
+		PostMessage((HWND)CallService(MS_CLUI_GETHWND, 0, 0), WM_COMMAND, ID_ICQ_EXIT, 0);
 	}	
 
 	if (restore_status && restart) // restore status if we're not doing an 'update and shutdown', and the update was unsuccessful (or there was nothing to update, or no need to shutdown)
-- 
cgit v1.2.3