Updated change log and made little fix.

2 files changed, 2 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b92e463c..cf2442d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 - Added player names below players
 - Added register button in login screen
 - Added warning message to use at least 4 characters as user name
+- Added scrollbar and command history to chat window
 - Improved skin on scrollbars, arrows and slider
 - Improved sound engine and added fade in and out option for music
 - Now you can use right mouse button to attack (enables also ranged attacks)
@@ -16,7 +17,6 @@
 - Fixed NPC lists not to show garbage
 - Fixed attack animation to be synced with attack speed
 - Fixed speech and emoticons position
-- Fixed long nicknames to be clipped in chat window
 - Fixed speech and damage display to be framerate independent
 - Fixed rendering of some monsters and items in OpenGL mode
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index a193a5e7..49841623 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -213,7 +213,7 @@ void ChatWindow::action(const std::string& eventId)
         std::string message = chatInput->getText();
 
         if (message.length() > 0) {
-            if (message != history.back()) {
+            if (history.size() == 0 || message != history.back()) {
                 history.push_back(message);
             }
             curHist = history.end();