check for wxOnAssert reentrancy

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 608a40ea4e023baa1930d4ba6fd262d222963da2..84f193af6271dd38b22cd4d068b091b27b44b3c6 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -313,19 +313,6 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;
 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;

-    static bool s_bInAssert = FALSE;        // FIXME MT-unsafe
-
-    if ( s_bInAssert )
-    {
-        // He-e-e-e-elp!! we're trapped in endless loop
-        wxTrap();
-
-        s_bInAssert = FALSE;
-
-        return;
-    }
-
-    s_bInAssert = TRUE;

 
     wxChar szBuf[4096];
 
 
     wxChar szBuf[4096];
 


@@ -396,13 +383,26 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
         wxTrap();
 #endif // GUI/!GUI
     }
         wxTrap();
 #endif // GUI/!GUI
     }

-
-    s_bInAssert = FALSE;

 }
 
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {
 }
 
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {

+    // FIXME MT-unsafe
+    static bool s_bInAssert = FALSE;
+
+    if ( s_bInAssert )
+    {
+        // He-e-e-e-elp!! we're trapped in endless loop
+        wxTrap();
+
+        s_bInAssert = FALSE;
+
+        return;
+    }
+
+    s_bInAssert = TRUE;
+

     if ( !wxTheApp )
     {
         // by default, show the assert dialog box - we can't customize this
     if ( !wxTheApp )
     {
         // by default, show the assert dialog box - we can't customize this


@@ -414,6 +414,8 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         // let the app process it as it wants
         wxTheApp->OnAssert(szFile, nLine, szMsg);
     }
         // let the app process it as it wants
         wxTheApp->OnAssert(szFile, nLine, szMsg);
     }

+
+    s_bInAssert = FALSE;

 }
 
 void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg)
 }
 
 void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg)