* Fix segfault on shutdown in drv_picoLCDGraphic.c

* Prevent dbus from exiting the program when compiled with -DDEBUG

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1068 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_picoLCDGraphic.c b/drv_picoLCDGraphic.c
index 05773377cb3c16c06082f2ca75795b0c4207424f..5e7e159aae50ab844e56eea7b91504045380bed7 100644 (file)
--- a/drv_picoLCDGraphic.c
+++ b/drv_picoLCDGraphic.c
@@ -608,8 +608,6 @@ int drv_pLG_quit(const int quiet)
 
     info("%s: shutting down.", Name);
 
-    drv_generic_graphic_quit();
-
     /* clear display */
     drv_pLG_clear();
 
@@ -625,6 +623,8 @@ int drv_pLG_quit(const int quiet)
        BufPtr = NULL;
     }
 
+    drv_generic_graphic_quit();
+
     return (0);
 }
 

diff --git a/plugin_dbus.c b/plugin_dbus.c
index da93949d203d23600ae8671e0f0e49d83bdae558..b40c3b61bfe8b303fa6b3eaa0a510a3f2fe4e34e 100644 (file)
--- a/plugin_dbus.c
+++ b/plugin_dbus.c
@@ -510,6 +510,9 @@ static int lcd_dbus_init(void)
        dbus_error_free(&err);
        success &= 1;
     } else {
+#ifdef DEBUG
+    dbus_connection_set_exit_on_disconnect(sessconn, FALSE);
+#endif
        setup_dbus_events(sessconn);
     }
 
@@ -518,6 +521,9 @@ static int lcd_dbus_init(void)
        info("[DBus] Error connecting to the dbus system bus: %s\n", err.message);
        success &= 2;
     } else {
+#ifdef DEBUG
+    dbus_connection_set_exit_on_disconnect(sysconn, FALSE);
+#endif
        setup_dbus_events(sysconn);
     }