Debugger::shutdownHandler() always unsets $reserved

kratkyzobak · Jan 4, 2017 · 25d5f74 · 25d5f74
1 parent bd70b5c
commit 25d5f74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Tracy/Debugger.php b/src/Tracy/Debugger.php
@@ -240,6 +240,7 @@ public static function shutdownHandler()
 		if (!self::$reserved) {
 			return;
 		}
+		self::$reserved = NULL;
 
 		$error = error_get_last();
 		if (in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE, E_RECOVERABLE_ERROR, E_USER_ERROR], TRUE)) {
@@ -249,7 +250,6 @@ public static function shutdownHandler()
 			);
 
 		} elseif (self::$showBar && !self::$productionMode) {
-			self::$reserved = NULL;
 			self::removeOutputBuffers(FALSE);
 			self::getBar()->render();
 		}
@@ -264,7 +264,7 @@ public static function shutdownHandler()
 	 */
 	public static function exceptionHandler($exception, $exit = TRUE)
 	{
-		if (!self::$reserved) {
+		if (!self::$reserved && $exit) {
 			return;
 		}
 		self::$reserved = NULL;