From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 May 2008 12:47:27 +0000 (+0000)
Subject: fix assert in ANSI build in wxConsoleStderr::GetCommandHistory() (ticket 9146)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1033a7cc58a82ea89d2214ceb729069681f58116

fix assert in ANSI build in wxConsoleStderr::GetCommandHistory() (ticket 9146)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 31ce0f4bb4..9c5011f730 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -477,7 +477,15 @@ int wxConsoleStderr::GetCommandHistory(wxWxCharBuffer& buf) const
     if ( len )
     {
         buf.extend(len);
-        const int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE);
+
+        int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE);
+
+#if !wxUSE_UNICODE
+        // there seems to be a bug in the GetConsoleCommandHistoryA(), it
+        // returns the length of Unicode string and not ANSI one
+        len2 /= 2;
+#endif // !wxUSE_UNICODE
+
         if ( len2 != len )
         {
             wxFAIL_MSG( _T("failed getting history?") );