From 06980c949e1226122a8023e57d43cac5a2054130 Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Mon, 27 Jan 2014 21:56:49 +0100
Subject: [PATCH] improvement error handler

---
 application/core/ErrorHandler.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php
index d69b683c..600d448f 100644
--- a/application/core/ErrorHandler.php
+++ b/application/core/ErrorHandler.php
@@ -1,4 +1,5 @@
 <?php
+use ManiaControl\ManiaControl;
 
 /**
  * Error and Exception Manager Class
@@ -6,22 +7,30 @@
  * @author steeffeen & kremsy
  */
 class ErrorHandler {
+	/**
+	 * Private Properties
+	 */
+	private $maniaControl = null;
+
 	/**
 	 * Construct Error Handler
 	 */
-	public function __construct() {
+	public function __construct(ManiaControl $maniaControl) {
+		$this->maniaControl = $maniaControl;
 		set_error_handler(array(&$this, 'errorHandler'), -1);
 		set_exception_handler(array(&$this, 'exceptionHandler'));
 	}
 
 	/**
 	 * ManiaControl ExceptionHandler
+	 * ManiaControl Shuts down after exception
 	 *
 	 * @param Exception $ex
 	 */
-	public function exceptionHandler(Exception $ex) {
+	public function exceptionHandler(\Exception $ex) {
 		$message = "[ManiaControl EXCEPTION]: {$ex->getMessage()} Trace: {$ex->getTraceAsString()}!";
 		logMessage($message);
+		exit();
 	}
 
 	/**