From 2962ff3054e268200e8750f8b82dcd3a09926d0e Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Wed, 14 Jan 2009 21:28:56 +0000
Subject: Proper fix for #46256, now handling Cancel button correctly.

---
 lib/network/drakfirewall.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/network')

diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 5051eb6..aa52e9b 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -274,6 +274,9 @@ Please select which network activities should be watched."),
                    ]) or return;
     my ($rules, $ports) = partition { exists $_->{ifw_rule} } grep { $_->{ifw} } @l;
     set_ifw($in->do_pkgs, $enabled, [ map { $_->{ifw_rule} } @$rules ], to_ports($ports));
+
+    # return something to say that we are done ok
+    $rules, $ports;
 }
 
 sub main {
@@ -283,7 +286,9 @@ sub main {
 
     ($disabled, $servers, $unlisted, $log_net_drop) = choose_allowed_services($in, $disabled, $servers, $unlisted, $log_net_drop) or return;
 
-    choose_watched_services($in, $servers, $unlisted) unless $disabled;
+    if (!$disabled) {
+        choose_watched_services($in, $servers, $unlisted) or return;
+    }
 
     my $ports = to_ports($servers, $unlisted);
     set_ports($in->do_pkgs, $disabled, $ports, $log_net_drop, $in) or return;
-- 
cgit v1.2.1