Fix server console history not working right with utf

Author: patrikjuvonen

Server/core/CServerImpl.cpp

@@ -794,14 +794,16 @@ void CServerImpl::HandleInput()
                 }
                 else
                 {
-                    SString szCommand = UTF16ToMbUTF8(m_szInputBuffer).c_str();
                     // Otherwise, pass the command to the mod's input handler
-                    m_pModManager->HandleInput(szCommand);
+                    m_pModManager->HandleInput(UTF16ToMbUTF8(m_szInputBuffer).c_str());
 
                     // If the command is not empty and it isn't identical to the previous entry in history, add it to the history
                     // The first string is the original command, the second string is for storing the edited command
-                    if (!szCommand.empty() && (m_vecCommandHistory.empty() || m_vecCommandHistory.back()[0] != szCommand))
-                        m_vecCommandHistory.push_back({szCommand, szCommand});
+                    if (const std::wstring wzCommand = m_szInputBuffer;
+                        !wzCommand.empty() && (m_vecCommandHistory.empty() || m_vecCommandHistory.back()[0] != wzCommand))
+                    {
+                        m_vecCommandHistory.push_back({wzCommand, wzCommand});
+                    }
                 }
             }
 
@@ -962,20 +964,20 @@ void CServerImpl::SelectCommandHistoryEntry(uint uiEntry)
         m_uiSelectedCommandHistoryEntry = 0;
 
     // Save current input buffer to the command history entry as the second element
-    m_vecCommandHistory[uiPreviouslySelectedCommandHistoryEntry][1] = UTF16ToMbUTF8(m_szInputBuffer).c_str();
+    m_vecCommandHistory[uiPreviouslySelectedCommandHistoryEntry][1] = std::wstring(m_szInputBuffer);
 
     // Clear input
     ClearInput();
 
     // If the selected command is empty, let's just stop here
-    SString szInput = m_vecCommandHistory[m_uiSelectedCommandHistoryEntry][1];
-    if (szInput.empty())
+    const auto wzInput = m_vecCommandHistory[m_uiSelectedCommandHistoryEntry][1];
+    if (wzInput.empty())
         return;
 
     // Fill the input buffer
-    m_uiInputCount = szInput.length();
-    for (uint i = 0; i < szInput.length(); i++)
-        m_szInputBuffer[i] = szInput[i];
+    m_uiInputCount = wzInput.length();
+    for (uint i = 0; i < wzInput.length(); i++)
+        m_szInputBuffer[i] = wzInput[i];
 
     // Let's print it out
     wchar_t szBuffer[255] = {};

Server/core/CServerImpl.h

@@ -109,8 +109,8 @@ class CServerImpl : public CServerInterface
 
     int m_exitCode;
 
-    std::vector<std::vector<SString>> m_vecCommandHistory = {{"", ""}};
-    uint                              m_uiSelectedCommandHistoryEntry = 0;
+    std::vector<std::vector<std::wstring>> m_vecCommandHistory = {{L"", L""}};
+    uint                                   m_uiSelectedCommandHistoryEntry = 0;
 
 #ifdef WIN32
     HANDLE    m_hConsole;