From 90e92ca2c80cee80f77cf3cd6f820735224c55d6 Mon Sep 17 00:00:00 2001
From: Joscha <brummer@migejolise.de>
Date: Mon, 23 May 2016 17:54:19 +0200
Subject: [PATCH] Fix nick change error

---
 yaboli/room.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/yaboli/room.py b/yaboli/room.py
index ef58f8e..75201d9 100644
--- a/yaboli/room.py
+++ b/yaboli/room.py
@@ -254,6 +254,8 @@ class Room():
 		Change your nick.
 		"""
 		
+		self.nick = nick
+		
 		self._con.add_next_callback(self._handle_nick_reply)
 		self._con.send_packet("nick", name=nick)
 	
@@ -511,9 +513,13 @@ class Room():
 		"""
 		
 		if "to" in data:
-			self.nick = data["to"]
 			self.session.name = self.nick
 			self._callbacks.call("identity")
+			
+			if data["to"] != self.nick:
+				self.set_nick(self.nick)
+			else:
+				self.nick = data["to"]
 	
 	def _handle_send_reply(self, data):
 		"""