applied patch 90459

[wxWidgets.git] / src / common / appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 7296444c794a83541d7f79c9163223ba38f3fa5b..fc9ed075b9cd1c7e55d74efd08b1d701877e6aeb 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -128,6 +128,14 @@ wxAppConsole::~wxAppConsole()
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {
+#if wxUSE_LOG 
+    // If some code logged something before wxApp instance was created,
+    // wxLogStderr was set as the target. Undo it here by destroying the
+    // current target. It will be re-created next time logging is needed, but
+    // this time wxAppTraits will be used:
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+    
     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;