Merge remote-tracking branch 'origin/master'

2016-07-29 00:10:34 +01:00
parent c8f53a64fe 3396e75d23
commit a02be1f1b6
1 changed files with 6 additions and 1 deletions
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -397,7 +397,11 @@ session_check_autoaway(void)
                    if (saved_status) {
                        free(saved_status);
                    }
-                    saved_status = curr_status;
+                    if (curr_status) {
+                        saved_status = strdup(curr_status);
+                    } else {
+                        saved_status = NULL;
+                    }

                    // send away presence with last activity
                    char *message = prefs_get_string(PREF_AUTOAWAY_MESSAGE);
@@ -481,6 +485,7 @@ session_check_autoaway(void)
        break;
    }

+    free(curr_status);
    prefs_free_string(mode);
 }