MINOR Fixing "No current controller available" error when TestSession…

…::__destruct() is called
silverstripe · May 24, 2012 · b325fea · b325fea
1 parent 9074f52
commit b325fea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dev/TestSession.php b/dev/TestSession.php
@@ -32,9 +32,9 @@ function __construct() {
 	function __destruct() {
 		// Shift off anything else that's on the stack.  This can happen if something throws
 		// an exception that causes a premature TestSession::__destruct() call
-		while(Controller::curr() != $this->controller) Controller::curr()->popCurrent();
+		while(Controller::has_curr() && Controller::curr() !== $this->controller) Controller::curr()->popCurrent();
 
-		$this->controller->popCurrent();
+		if(Controller::has_curr()) $this->controller->popCurrent();
 	}
 
 	/**