aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Hal
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-05-04 15:51:29 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-05-04 15:51:29 +0100
commit49aa9fc5707909e2af697a0c60a0cf39db41a776 (patch)
tree1d85dd380fdb262de6b8ef1e8cbcb48b0e1f5e73 /lib/Hal
parent356846b3c3a02e715256b703e7f7ecf9e52036d1 (diff)
downloadperl-Hal-Cdroms-49aa9fc5707909e2af697a0c60a0cf39db41a776.tar
perl-Hal-Cdroms-49aa9fc5707909e2af697a0c60a0cf39db41a776.tar.gz
perl-Hal-Cdroms-49aa9fc5707909e2af697a0c60a0cf39db41a776.tar.bz2
perl-Hal-Cdroms-49aa9fc5707909e2af697a0c60a0cf39db41a776.tar.xz
perl-Hal-Cdroms-49aa9fc5707909e2af697a0c60a0cf39db41a776.zip
Remove reactor shutdown kludge - it's no longer necessary.
Diffstat (limited to 'lib/Hal')
-rw-r--r--lib/Hal/Cdroms.pm13
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/Hal/Cdroms.pm b/lib/Hal/Cdroms.pm
index 19d8263..a4e0b65 100644
--- a/lib/Hal/Cdroms.pm
+++ b/lib/Hal/Cdroms.pm
@@ -261,13 +261,13 @@ sub _reactor_wait {
if (my $val = $check_found->($msg)) {
$found_val = $val;
- _reactor_shutdown($reactor);
+ $reactor->shutdown;
}
1;
});
if ($timeout) {
$reactor->add_timeout($timeout, Net::DBus::Callback->new(method => sub {
- _reactor_shutdown($reactor);
+ $reactor->shutdown;
}));
}
$reactor->run;
@@ -275,15 +275,6 @@ sub _reactor_wait {
$found_val;
}
-sub _reactor_shutdown {
- my ($reactor) = @_;
-
- $reactor->shutdown;
-
- # ugly, but needed for shutdown to work...
- $reactor->add_timeout(1, Net::DBus::Callback->new(method => sub {}));
-}
-
sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 }
=head1 AUTHOR