Fix some glib nullptr-check warning messages

Signed-off-by: Steffen Jaeckel <[email protected]>
profanity-im · Oct 4, 2023 · 2b29d1b · 2b29d1b
1 parent 6f1ea08
commit 2b29d1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/config/accounts.c b/src/config/accounts.c
@@ -481,7 +481,7 @@ static void
 _accounts_set_string_option(const char* account_name, const char* const option, const char* const value)
 {
     if (accounts_account_exists(account_name)) {
-        g_key_file_set_string(accounts, account_name, option, value);
+        g_key_file_set_string(accounts, account_name, option, value ?: "");
         _save_accounts();
     }
 }

diff --git a/src/event/server_events.c b/src/event/server_events.c
@@ -300,7 +300,8 @@ sv_ev_room_history(ProfMessage* message)
     ProfMucWin* mucwin = wins_get_muc(message->from_jid->barejid);
     if (mucwin) {
         // if this is the first successful connection
-        if (ev_is_first_connect()) {
+        // or for some reason the `last_msg_timestamp` is not initialized
+        if (ev_is_first_connect() || !mucwin->last_msg_timestamp) {
             // save timestamp of last received muc message
             // so we dont display, if there was no activity in channel, once we reconnect
             if (mucwin->last_msg_timestamp) {