[Goodies-commits] r4693 - xfburn/trunk/xfburn

[David Mohr]

Author: squisher
Date: 2008-05-01 02:36:15 +0000 (Thu, 01 May 2008)
New Revision: 4693

Modified:
   xfburn/trunk/xfburn/xfburn-hal-manager.c
Log:
Bugfix: proper shutwdown of HAL

Modified: xfburn/trunk/xfburn/xfburn-hal-manager.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-hal-manager.c	2008-05-01 02:35:36 UTC (rev 4692)
+++ xfburn/trunk/xfburn/xfburn-hal-manager.c	2008-05-01 02:36:15 UTC (rev 4693)
@@ -153,13 +153,14 @@
       hal_context = NULL;
     }
     DBG ("Connection to dbus or hal failed!");
-    dbus_error_free (&derror);
   } else {
     libhal_ctx_set_device_added (hal_context, cb_device_added);
     libhal_ctx_set_device_removed (hal_context, cb_device_removed);
     libhal_ctx_set_device_property_modified (hal_context, cb_prop_modified);
   }
 
+  dbus_error_free (&derror);
+
   priv->hal_context = hal_context;
   priv->dbus_connection = dbus_connection;
 }
@@ -182,7 +183,12 @@
 {
   DBusError derror;
 
+  dbus_error_init (&derror);
   libhal_ctx_shutdown (hal_context, &derror);
+  if (dbus_error_is_set (&derror)) {
+    DBG ("Error shutting hal down!");
+  }
+  dbus_error_free (&derror);
   libhal_ctx_free (hal_context);
 }