commit f27920ccddd3f9305913075a343ad008a50c3ede
parent 2e7a82db9d53a37dd55d2f2842b72aa0737afdce
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 24 Feb 2008 11:46:02 -0800
Merge branch 'master' into next
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sup/hook.rb b/lib/sup/hook.rb
@@ -86,7 +86,7 @@ class HookManager
log "error running hook: #{e.message}"
log e.backtrace.join("\n")
@hooks[name] = nil # disable it
- BufferManager.flash "Error running hook: #{e.message}"
+ BufferManager.flash "Error running hook: #{e.message}" if BufferManager.instantiated?
end
context.__cleanup
result