merging

[urisagit/Stem.git] / lib / Stem / Event / Signal.pm

diff --git a/lib/Stem/Event/Signal.pm b/lib/Stem/Event/Signal.pm
index 14a85ba..6523103 100644 (file)
--- a/lib/Stem/Event/Signal.pm
+++ b/lib/Stem/Event/Signal.pm
@@ -32,8 +32,14 @@ sub _build {
 
        $SIG{ $signal } = $cached_handlers{$signal} ||=
                sub {
+<<<<<<< HEAD:lib/Stem/Event/Signal.pm
+       Stem::Event::Queue::queue_has_event() ;
+                       
+#print "HIT $signal\n";
+=======
 print "HIT $signal\n";
                        Stem::Event::Queue::mark_not_empty() ;
+>>>>>>> master:lib/Stem/Event/Signal.pm
                        push @signal_queue, $signal
                } ;
 
@@ -42,6 +48,12 @@ print "HIT $signal\n";
        $signal2event{$signal} = $self ;
 
 #print "$signal = $SIG{ $signal }\n" ;
+
+# make sure the event queue is set up so we can handle signals in the
+# event loop
+
+       Stem::Event::Queue::_init_event_queue() ;
+
        return ;
 }