summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-22 18:16:00 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-22 18:16:00 +0000
commitb6415056b97c1454b452a34f07de5bfa1be34593 (patch)
tree258df128777e7691ffa157c2451b8eecf56c283a
parente9994fc86c70813dff7b071e034754e7449416f7 (diff)
downloaddrakx-net-b6415056b97c1454b452a34f07de5bfa1be34593.tar
drakx-net-b6415056b97c1454b452a34f07de5bfa1be34593.tar.gz
drakx-net-b6415056b97c1454b452a34f07de5bfa1be34593.tar.bz2
drakx-net-b6415056b97c1454b452a34f07de5bfa1be34593.tar.xz
drakx-net-b6415056b97c1454b452a34f07de5bfa1be34593.zip
make sure not to run timers after quitting the main loop (#37635)
-rw-r--r--NEWS1
-rwxr-xr-xbin/net_monitor5
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index dbbaaf2..a171856 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o make expose_event callback more robust (#36537)
o make sure widgets got realized before any event callback is called
(#36537)
+ o make sure not to run timers after quitting the main loop (#37635)
0.25:
- draksambashare (aginies):
diff --git a/bin/net_monitor b/bin/net_monitor
index bf8f4f0..5c6464b 100755
--- a/bin/net_monitor
+++ b/bin/net_monitor
@@ -139,7 +139,7 @@ $window1->{window}->show_all;
# make sure widgets got realized before any event callback is called (#36537):
gtkflush();
-Glib::Timeout->add(1000, \&rescan);
+my $time_tag1 = Glib::Timeout->add(1000, \&rescan);
my $time_tag2 = Glib::Timeout->add(1000, \&update);
update();
@@ -173,6 +173,9 @@ my $during_connection;
my $first;
sub main_quit() {
+ foreach my $timeout ($time_tag1, $time_tag2) {
+ Glib::Source->remove($timeout) if $timeout;
+ }
$config{use_same_scale} = bool2yesno($use_same_scale);
setVarsInSh($cfg_file, \%config);
ugtk2->exit(0);