Merge 9df49cd3f7 into f1d1dad08b

src/console/Handlers.cpp

@@ -4,7 +4,6 @@
 #include "console/Command.hpp"
 #include "console/Screen.hpp"
 #include "event/Event.hpp"
-#include "storm/Unicode.hpp"
 #include <cstdint>
 
 static int32_t s_historyIndex = 0;
@@ -12,20 +11,24 @@ static int32_t s_historyIndex = 0;
 namespace {
 
 int32_t OnChar(const EVENT_DATA_CHAR* data, void* param) {
-    char character[8] = {};
+    char character[2];
 
     if (ConsoleAccessGetEnabled() && EventIsKeyDown(ConsoleGetHotKey())) {
         return 0;
     }
 
     if (ConsoleGetActive()) {
-        SUniSPutUTF8(data->ch, character);
+        character[0] = char(data->ch);
+        character[1] = 0;
 
         PasteInInputLine(character);
         ResetHighlight();
         return 0;
     }
 
+    // SUniSPutUTF8(data->ch, character);
+
+
     return 1;
 }
 

src/glue/CGlueMgr.cpp

@@ -366,10 +366,7 @@ void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t comp
         FrameScript_SignalEvent(4, "%s", msg);
     }
 
-    if (!complete) {
-        return;
-    }
-
+    if (complete) {
         if (result == 0) {
             if (errorCode != 2) {
                 // TODO
@@ -410,6 +407,7 @@ void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t comp
             return;
         }
     }
+}
 
 void CGlueMgr::PollLoginServerLogin() {
     if (CGlueMgr::m_loginState != LOGIN_STATE_PIN_WAIT) {