From 1137908b0395c613b2827428fd846242eaddb999 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Sun, 28 Apr 2013 19:56:11 +0000 Subject: - fixed empty "" chat rooms - fixed crash on profile update git-svn-id: http://svn.miranda-ng.org/main/trunk@4562 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_dialogs.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'protocols/Skype/src/skype_dialogs.cpp') diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 33a37f4d09..90c5949d6a 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -644,14 +644,15 @@ INT_PTR CALLBACK CSkypeProto::InviteToChatProc(HWND hwndDlg, UINT msg, WPARAM wP param->ppro->GetInviteContacts(NULL, hwndList, invitedContacts); wchar_t *chatID = ::mir_wstrdup(param->id); - + SEStringList needToAdd; + for (uint i = 0; i < (uint)invitedContacts.getCount(); i++) + needToAdd.append((char *)mir_ptr(::mir_u2a(invitedContacts[i]))); + CConversation::Ref conversation; if (chatID) { g_skype->GetConversationByIdentity(::mir_utf8encodeW(chatID), conversation); - for (uint i = 0; i < (uint)invitedContacts.getCount(); i++) - needToAdd.append((char *)mir_ptr(::mir_u2a(invitedContacts[i]))); conversation->AddConsumers(needToAdd); } else @@ -666,12 +667,12 @@ INT_PTR CALLBACK CSkypeProto::InviteToChatProc(HWND hwndDlg, UINT msg, WPARAM wP conversation->GetPropIdentity(data); chatID = ::mir_utf8decodeW(data); - param->ppro->JoinToChat(conversation); + //param->ppro->JoinToChat(conversation); } if (chatID) ::EndDialog(hwndDlg, IDOK); else - param->ppro->ShowNotification(TranslateT("You did not select any contact")); + param->ppro->ShowNotification(::TranslateT("You did not select any contact")); } break; -- cgit v1.2.3