diff options
| author | Eion Robb <eion@robbmob.com> | 2015-07-31 03:43:16 +0300 |
|---|---|---|
| committer | Eion Robb <eion@robbmob.com> | 2015-07-31 03:43:16 +0300 |
| commit | 5a6fb5854f9287ae31bf6aa1324f7972dda5ea19 (patch) | |
| tree | ee44941d87f69d3ffc0491de510c30223b0f9cf8 | |
| parent | 7102a6ebcf933916c2d38694408483f3ef74da95 (diff) | |
| parent | ef29269f64a478f2dcb8c24edb5acedcd1511bdf (diff) | |
Merge pull request #316 from krzysz00/chat-send-race-fix
SkypeWeb : Fix for chat messages not able to be sent in the serv-got-joined-chat signal
| -rw-r--r-- | skypeweb/skypeweb_messages.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c index 4a95c25..57927ad 100644 --- a/skypeweb/skypeweb_messages.c +++ b/skypeweb/skypeweb_messages.c @@ -1070,12 +1070,16 @@ skypeweb_chat_send(PurpleConnection *pc, gint id, const gchar *message, PurpleMe SkypeWebAccount *sa = purple_connection_get_protocol_data(pc);
PurpleChatConversation *chatconv;
- gchar* chatname;
+ const gchar* chatname;
chatconv = purple_conversations_find_chat(pc, id);
chatname = purple_conversation_get_data(PURPLE_CONVERSATION(chatconv), "chatname");
- if (!chatname)
- return -1;
+ if (!chatname) {
+ // Fix for a condition around the chat data and serv_got_joined_chat()
+ chatname = purple_conversation_get_name(PURPLE_CONVERSATION(chatconv));
+ if (!chatname)
+ return -1;
+ }
skypeweb_send_message(sa, chatname, message);
|