Changeset 537d9b9 for irc_cap.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• irc_cap.c (modified) (1 diff)

irc_cap.c

@@ -177 +177 @@
 
         } else if (g_strcasecmp(cmd[1], "END") == 0) {
+                if (!(irc->status & USTATUS_CAP_PENDING)) {
+                        return;
+                }
                 irc->status &= ~USTATUS_CAP_PENDING;