diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2014-11-28 21:19:14 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2014-11-28 21:19:14 +0000 |
| commit | 6895d635acb37ba42e53ba95ca3eee2ddbbef24d (patch) | |
| tree | f85a1d97784c4597099864119acb027b9a3f2dba /protocols/SkypeClassic/src/gchat.cpp | |
| parent | 8ef06acf351fdb6034b6e13670d84bfd79161956 (diff) | |
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
Diffstat (limited to 'protocols/SkypeClassic/src/gchat.cpp')
| -rw-r--r-- | protocols/SkypeClassic/src/gchat.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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;
|