From 6895d635acb37ba42e53ba95ca3eee2ddbbef24d Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Fri, 28 Nov 2014 21:19:14 +0000
Subject: Massive code cleanup and fixes for a lot of warnings reported in #837

git-svn-id: http://svn.miranda-ng.org/main/trunk@11136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/SkypeClassic/src/gchat.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'protocols/SkypeClassic/src/gchat.cpp')

diff --git a/protocols/SkypeClassic/src/gchat.cpp b/protocols/SkypeClassic/src/gchat.cpp
index a36884bc11..02046beeca 100644
--- a/protocols/SkypeClassic/src/gchat.cpp
+++ b/protocols/SkypeClassic/src/gchat.cpp
@@ -595,9 +595,8 @@ void SetChatTopic(const TCHAR *szChatId, TCHAR *szTopic, BOOL bSet)
 
 int GCEventHook(WPARAM,LPARAM lParam) {
 	GCHOOK *gch = (GCHOOK*) lParam;
-	gchat_contacts *gc = GetChat(gch->pDest->ptszID);
-
 	if(gch) {
+		gchat_contacts *gc = GetChat(gch->pDest->ptszID);
 		if (!_stricmp(gch->pDest->pszModule, SKYPE_PROTONAME)) {
 
 			switch (gch->pDest->iType) {
@@ -847,8 +846,10 @@ void GCExit(void)
 {
 	DeleteCriticalSection (&m_GCMutex);
 	for (int i=0;i<chatcount;i++) {
-		if (chats[i].szChatName) free(chats[i].szChatName);
-		if (chats[i].mJoinedContacts) free(chats[i].mJoinedContacts);
+		if(chats[i]) {
+			free(chats[i].szChatName);
+			free(chats[i].mJoinedContacts);
+		}
 	}
 	if (chats) free (chats);
 	chats = NULL;
-- 
cgit v1.2.3