lib/god/watch.rb in god-0.7.22 vs lib/god/watch.rb in god-0.8.0

@@ -102,11 +102,11 @@
     # Actions
     #
     ###########################################################################
     
     def action(a, c = nil)
-      if Thread.current != self.driver.thread
+      if !self.driver.in_driver_context?
         # called from outside Driver
         
         # send an async message to Driver
         self.driver.message(:action, [a, c])
       else
@@ -175,9 +175,10 @@
       God.registry.add(@process)
     end
     
     def unregister!
       God.registry.remove(@process)
+      super
     end
   end
   
 end