summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-04-26 20:37:41 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-04-26 20:37:41 +0000
commitddbeef14631c4232cbd0e9e8d04dcc217cfe5fe6 (patch)
treeeca0720f6b80683d266fd2990ce3fdcc1531ffbd /protocols
parentd3205b4a9cbfe603146a9d2adab6a468424f8f5d (diff)
more correct version of SetStatus
git-svn-id: http://svn.miranda-ng.org/main/trunk@4541 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/Skype/src/skype_proto.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index faf7a980e0..52f976e934 100644
--- a/protocols/Skype/src/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -385,7 +385,6 @@ int CSkypeProto::SetStatus(int new_status)
{
this->LogOut();
this->m_iStatus = this->m_iDesiredStatus = ID_STATUS_OFFLINE;
- this->SendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
}
else
{
@@ -397,13 +396,16 @@ int CSkypeProto::SetStatus(int new_status)
}
else
{
- if ( this->account->IsOnline())
+ if ( this->account->IsOnline()) {
SetServerStatus(new_status);
- else
- SendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
+ return 0;
+ }
+
+ SendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
}
}
+ this->SendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
return 0;
}