summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-20 05:51:14 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-20 05:51:14 +0000
commit62834ff87581af7ec1d21a598a2a2440b25463a5 (patch)
tree03aca73b608487f2f17340314e581fd2732ce23a /perl-install
parent32dfea04603bc862266fe469295200fb4509297e (diff)
downloaddrakx-62834ff87581af7ec1d21a598a2a2440b25463a5.tar
drakx-62834ff87581af7ec1d21a598a2a2440b25463a5.tar.gz
drakx-62834ff87581af7ec1d21a598a2a2440b25463a5.tar.bz2
drakx-62834ff87581af7ec1d21a598a2a2440b25463a5.tar.xz
drakx-62834ff87581af7ec1d21a598a2a2440b25463a5.zip
remove connection time timer if connection fails (fix #11590)
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/net_monitor4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 0cc59aed2..f5f2031df 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -192,7 +192,7 @@ sub connection() {
my ($sec, $min, $hour) = gmtime(time() - $c_time);
my $e = sprintf("%02d:%02d:%02d", $hour, $min, $sec);
$label_ct->set_label($e); 1 })
- } else { Glib::Source->remove($ct_tag) }
+ }
my $nb_point = 1;
$first = 1;
@@ -235,6 +235,8 @@ sub connection() {
N("Connection complete.") :
N("Connection failed.\nVerify your configuration in the Mandrakelinux Control Center."))
);
+ # remove the connection time timer if connection is down or failed
+ $isconnected or Glib::Source->remove($ct_tag);
my $delay = 1000;
# keep the message displayed longer if there is a problem.
if ($isconnected == $wasconnected) { $delay = 5000 }