From dc0661ecf229f34b766a90a0a989fff0290878ab Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Sat, 10 Jan 2015 14:35:33 +0000
Subject: SkypeClassic: - Fixed bug from r11805 - workaround for LPGEN

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

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

diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 746e51ad9a..4eafe65e8c 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -679,9 +679,9 @@ void __cdecl SkypeSystemInit(char *dummy) {
 						{
 							int oldstatus;
 							char szError[256];
-							sprintf(szError, Translate("Username '%s' provided by Skype API doesn't match username '%s' in "
-								"your settings. Please either remove username setting in you configuration or correct "
-								"it. Will not connect!"), pszUser, dbv.pszVal);
+							sprintf(szError,
+								Translate("Username '%s' provided by Skype API doesn't match username '%s' in your settings. Please either remove username setting in your configuration or correct it. Will not connect!"),
+								pszUser, dbv.pszVal);
 							OUTPUTA(szError);
 							Initializing = FALSE;
 							AttachStatus = -1;
@@ -2700,7 +2700,6 @@ void MessageSendWatchThread(void *a) {
 INT_PTR SkypeSendMessage(WPARAM, LPARAM lParam) {
 	CCSDATA *ccs = (CCSDATA *)lParam;
 	DBVARIANT dbv;
-	BOOL sendok = TRUE;
 	char *msg = (char *)ccs->lParam, *utfmsg = NULL, *mymsgcmd = cmdMessage, szId[16] = { 0 };
 	static DWORD dwMsgNum = 0;
 	BYTE bIsChatroom = 0 != db_get_b(ccs->hContact, SKYPE_PROTONAME, "ChatRoom", 0);
@@ -2732,7 +2731,9 @@ INT_PTR SkypeSendMessage(WPARAM, LPARAM lParam) {
 		sprintf(szId, "#M%d ", dwMsgNum++);
 	}
 	InterlockedIncrement(&sendwatchers);
-	if (!utfmsg || SkypeSend("%s%s %s %s", szId, mymsgcmd, dbv.pszVal, utfmsg)) sendok = FALSE;
+	BOOL sendok = true;
+	if (!utfmsg || SkypeSend("%s%s %s %s", szId, mymsgcmd, dbv.pszVal, utfmsg))
+		sendok = false;
 	if (utfmsg && utfmsg != msg) free(utfmsg);
 	db_free(&dbv);
 
@@ -2749,11 +2750,12 @@ INT_PTR SkypeSendMessage(WPARAM, LPARAM lParam) {
 				pthread_create(MessageSendWatchThread, psendarg);
 				return 1;
 			}
-			InterlockedDecrement(&sendwatchers);
 		}
+		InterlockedDecrement(&sendwatchers);
 		return 1;
 	}
-	else InterlockedDecrement(&sendwatchers);
+	else
+		InterlockedDecrement(&sendwatchers);
 	if (!bIsChatroom)
 		ProtoBroadcastAck(SKYPE_PROTONAME, ccs->hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)1, (LPARAM)Translate("Connection to Skype lost"));
 	return 0;
-- 
cgit v1.2.3