changeset 1733:a9b0364c0cb2

Fix segfault introduced in previous commit
author Mikael Berthe <mikael@lilotux.net>
date Mon, 01 Mar 2010 20:23:22 +0100
parents 4e57d6275a86
children eae4a2637f2c
files mcabber/mcabber/screen.c mcabber/mcabber/screen.h mcabber/mcabber/xmpp.c
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/mcabber/screen.c	Sun Feb 28 21:25:18 2010 +0100
+++ b/mcabber/mcabber/screen.c	Mon Mar 01 20:23:22 2010 +0100
@@ -735,6 +735,11 @@
   utf8_mode = (strcmp(LocaleCharSet, "UTF-8") == 0);
 }
 
+gboolean scr_CursesStatus(void)
+{
+  return Curses;
+}
+
 void scr_InitCurses(void)
 {
   /* Key sequences initialization */
--- a/mcabber/mcabber/screen.h	Sun Feb 28 21:25:18 2010 +0100
+++ b/mcabber/mcabber/screen.h	Mon Mar 01 20:23:22 2010 +0100
@@ -93,6 +93,7 @@
 void scr_InitLocaleCharSet(void);
 void scr_InitCurses(void);
 void scr_TerminateCurses(void);
+gboolean scr_CursesStatus(void);
 void scr_DrawMainWindow(unsigned int fullinit);
 void scr_DrawRoster(void);
 void scr_UpdateMainStatus(int forceupdate);
--- a/mcabber/mcabber/xmpp.c	Sun Feb 28 21:25:18 2010 +0100
+++ b/mcabber/mcabber/xmpp.c	Mon Mar 01 20:23:22 2010 +0100
@@ -1917,6 +1917,9 @@
       mystatusmsg = NULL;
   }
 
+  if (!scr_CursesStatus())
+    return;  // Called from config. file
+
   if (!Autoaway)
     update_last_use();