summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>2008-09-30 12:28:10 +0000
committertv <tv@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>2008-09-30 12:28:10 +0000
commit1fdcb25051bf31ad71f07d7591f33a84feaeba50 (patch)
treec079f41c76a6e5c25de8cc4c9d69a48e48620612
parentc1245ed0d7158c1240a2228b2beb2f5f02938e22 (diff)
downloaddraksnapshot-1fdcb25051bf31ad71f07d7591f33a84feaeba50.tar
draksnapshot-1fdcb25051bf31ad71f07d7591f33a84feaeba50.tar.gz
draksnapshot-1fdcb25051bf31ad71f07d7591f33a84feaeba50.tar.bz2
draksnapshot-1fdcb25051bf31ad71f07d7591f33a84feaeba50.tar.xz
draksnapshot-1fdcb25051bf31ad71f07d7591f33a84feaeba50.zip
fix crash if DBus is active but Hal isn't (#44434)
git-svn-id: http://svn.mandriva.com/svn/soft/draksnapshot/trunk@247124 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94
-rw-r--r--NEWS3
-rwxr-xr-xdraksnapshot-applet3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 26f48f8..4cbfb32 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- applet:
+ o fix crash if DBus is active but Hal isn't (#44434)
+
Version 0.17 - 30 September 2008, Thierry Vignaud
- configurator:
diff --git a/draksnapshot-applet b/draksnapshot-applet
index 587a1f7..715604e 100755
--- a/draksnapshot-applet
+++ b/draksnapshot-applet
@@ -93,8 +93,7 @@ my $dbus_error = $@;
# initializing DBus/HAL:
my ($do, $con);
-if ($dbus) {
- $do = dbus_object->new($dbus, $hal_dn, $manager_path, $hal_manager);
+if ($dbus && $do = eval { dbus_object->new($dbus, $hal_dn, $manager_path, $hal_manager) }) {
$con = eval { $dbus->{connection} };
my $old_time;