(firstCheck) move the eval{} here so that all callers got protected,

thus fixing crash when hal is confused (#44966)


git-svn-id: http://svn.mandriva.com/svn/soft/draksnapshot/trunk@250360 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94

2 files changed, 6 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 8ac39aa..0b5424d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- applet:
+  o fix crash when hal is confused (#44966)
+
 Version 0.19 - 30 September 2008, Thierry Vignaud
 
 - configurator:
diff --git a/draksnapshot-applet b/draksnapshot-applet
index 765d31f..2af1bc4 100755
--- a/draksnapshot-applet
+++ b/draksnapshot-applet
@@ -103,7 +103,7 @@ if ($dbus && $do) {
 
                          # hide if needed (evals really are needed):
                          if (eval { 'DeviceRemoved' eq $msg->get_member() }) {
-                             eval { firstCheck() };
+                             firstCheck();
                              return 0;
                          }
 
@@ -210,7 +210,8 @@ sub configure() {
 }
 
 sub firstCheck() {
-    my @discs = find_removable_volumes($dbus);
+    # evals really are needed:
+    my @discs = eval { find_removable_volumes($dbus) };
 
     go2State(@discs ? 'disk_found' : 'okay');
 }