Changeset 537d9b9 for irc_channel.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • irc_channel.c

    rba52ac5 r537d9b9  
    245245        ic->users = g_slist_insert_sorted(ic->users, icu, irc_channel_user_cmp);
    246246
    247         irc_channel_update_ops(ic, set_getstr(&ic->irc->b->set, "ops"));
     247        if (iu == ic->irc->user || iu == ic->irc->root) {
     248                irc_channel_update_ops(ic, set_getstr(&ic->irc->b->set, "ops"));
     249        }
    248250
    249251        if (iu == ic->irc->user || ic->flags & IRC_CHANNEL_JOINED) {
Note: See TracChangeset for help on using the changeset viewer.