summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/nick-rec.h2
-rw-r--r--src/irc/core/irc-session.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nick-rec.h b/src/core/nick-rec.h
index 8e641222..aaedded9 100644
--- a/src/core/nick-rec.h
+++ b/src/core/nick-rec.h
@@ -19,7 +19,7 @@ unsigned int send_massjoin:1; /* Waiting to be sent in massjoin signal */
unsigned int op:1;
unsigned int halfop:1;
unsigned int voice:1;
-unsigned int other:7;
+char other;
/*GHashTable *module_data;*/
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 797e084e..fda9f9c3 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -94,7 +94,7 @@ static void sig_session_restore_server(IRC_SERVER_REC *server,
}
node = config_node_section(node, "isupport", -1);
- tmp = config_node_first(node->value);
+ tmp = node == NULL ? NULL : config_node_first(node->value);
if(tmp != NULL)
server->isupport_sent = TRUE;
@@ -129,7 +129,7 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel,
halfop = config_node_get_bool(node, "halfop", FALSE);
nickrec = irc_nicklist_insert(channel, nick, op, halfop, voice, FALSE);
other = config_node_get_str(node, "other", FALSE);
- nickrec->other = other[0];
+ nickrec->other = other == NULL ? '\0' : other[0];
}
static void session_restore_channel(IRC_CHANNEL_REC *channel)