X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08989e30ede130f0ec29ddf0d4f36a71211bdcee..c220a8ec4fcb4e7b620e88c76b0a84be4554b28b:/src/common/init.cpp?ds=sidebyside

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 407fe5cb3e..459d37a7cc 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -312,26 +312,26 @@ bool wxEntryStart(int& argc, char **argv)
 // clean up
 // ----------------------------------------------------------------------------
 
-// cleanup done before destroying wxTheApp 
+// cleanup done before destroying wxTheApp
 static void DoCommonPreCleanup()
 {
 #if wxUSE_LOG
     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
     // below and the user supplied one might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
+    // wxWidgets GUI function is unsafe starting from now)
     wxLog::DontCreateOnDemand();
 
     // this will flush the old messages if any
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #endif // wxUSE_LOG
-
-    wxModule::CleanUpModules();
 }
 
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {
+    wxModule::CleanUpModules();
+
     wxClassInfo::CleanUp();
 
     // we can't do this in wxApp itself because it doesn't know if argv had
@@ -433,6 +433,8 @@ int wxEntry(int& argc, wxChar **argv)
     {
 #ifdef __WXWINCE__
         ::ExitThread(3); // the same exit code as abort()
+#elif __PALMOS__
+        return -1;
 #else
         ::ExitProcess(3); // the same exit code as abort()
 #endif