From 6b056e3cfad2783fc6393f005807356163d2adcb Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Fri, 31 Jan 2014 17:08:20 +0100
Subject: [PATCH] exception chatclass

---
 application/core/Chat.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/core/Chat.php b/application/core/Chat.php
index 090bfb72..12ee3497 100644
--- a/application/core/Chat.php
+++ b/application/core/Chat.php
@@ -45,10 +45,10 @@ class Chat {
 	 * @return string
 	 */
 	private function getPrefix($prefix) {
-		if(is_string($prefix)) {
+		if (is_string($prefix)) {
 			return $prefix;
 		}
-		if($prefix === true) {
+		if ($prefix === true) {
 			return $this->maniaControl->settingManager->getSetting($this, self::SETTING_PREFIX);
 		}
 		return '';
@@ -63,14 +63,20 @@ class Chat {
 	 * @return bool
 	 */
 	public function sendChat($message, $login = null, $prefix = true) {
-		if(!$this->maniaControl->client) {
+		if (!$this->maniaControl->client) {
 			return false;
 		}
 		$chatMessage = '$z$<' . $this->getPrefix($prefix) . $message . '$>$z';
-		if($login === null) {
-			return $this->maniaControl->client->chatSendServerMessage($chatMessage);
+		try {
+			if ($login === null) {
+				$this->maniaControl->client->chatSendServerMessage($chatMessage);
+			} else {
+				$this->maniaControl->client->chatSendServerMessage($chatMessage, $login);
+			}
+		} catch(\Exception $e) {
+			return false;
 		}
-		return $this->maniaControl->client->chatSendServerMessage($chatMessage, $login);
+		return true;
 	}
 
 	/**