From 3d64cefb8851fcf43b9c6109abdddaf71e340a71 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 14 Jul 2012 14:57:37 +0000
Subject: - various leaks - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@965 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/icq_infoupdate.cpp | 2 +-
 protocols/IcqOscarJ/icq_proto.cpp      | 3 +++
 protocols/IcqOscarJ/icq_server.cpp     | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols')

diff --git a/protocols/IcqOscarJ/icq_infoupdate.cpp b/protocols/IcqOscarJ/icq_infoupdate.cpp
index 5d0abbf47c..014df20e01 100644
--- a/protocols/IcqOscarJ/icq_infoupdate.cpp
+++ b/protocols/IcqOscarJ/icq_infoupdate.cpp
@@ -27,8 +27,8 @@
 //  Background thread for automatic update of user details
 //
 // -----------------------------------------------------------------------------
-#include "icqoscar.h"
 
+#include "icqoscar.h"
 
 // Retrieve users' info
 void CIcqProto::icq_InitInfoUpdate(void)
diff --git a/protocols/IcqOscarJ/icq_proto.cpp b/protocols/IcqOscarJ/icq_proto.cpp
index 8e5d11100c..69b8ed8e61 100644
--- a/protocols/IcqOscarJ/icq_proto.cpp
+++ b/protocols/IcqOscarJ/icq_proto.cpp
@@ -359,6 +359,9 @@ int CIcqProto::OnModulesLoaded( WPARAM wParam, LPARAM lParam )
 
 int CIcqProto::OnPreShutdown(WPARAM wParam,LPARAM lParam)
 {
+	// signal info update thread to stop
+	icq_InfoUpdateCleanup();
+
 	// Make sure all connections are closed
 	CloseContactDirectConns(NULL);
 	return 0;
diff --git a/protocols/IcqOscarJ/icq_server.cpp b/protocols/IcqOscarJ/icq_server.cpp
index 1226eae0c4..87b975d6d3 100644
--- a/protocols/IcqOscarJ/icq_server.cpp
+++ b/protocols/IcqOscarJ/icq_server.cpp
@@ -182,9 +182,6 @@ void __cdecl CIcqProto::ServerThread(serverthread_start_info *infoParam)
 		SetCurrentStatus(ID_STATUS_OFFLINE);
 	}
 
-	// signal info update thread to stop
-	icq_InfoUpdateCleanup();
-
 	// signal keep-alive thread to stop
 	StopKeepAlive(&info);
 
-- 
cgit v1.2.3