X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72516be4ffebfc82f210ea00f02d49c43580a4d7..36adcfc9135110ee27c6e4247e5d29175159694f:/include/wx/debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 29d4deac3b..593af341d7 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -259,7 +259,10 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
     // wxFAIL is a special form of assert: it always triggers (and so is
     // usually used in normally unreachable code)
     #define wxFAIL_COND_MSG(cond, msg) \
-        wxOnAssert(__FILE__, __LINE__,  __WXFUNCTION__, cond, msg)
+        if ( !wxTheAssertHandler )                                            \
+        {}                                                                    \
+        else                                                                  \
+            wxOnAssert(__FILE__, __LINE__,  __WXFUNCTION__, cond, msg)
     #define wxFAIL_MSG(msg) wxFAIL_COND_MSG("Assert failure", msg)
     #define wxFAIL wxFAIL_MSG((const char*)NULL)
 #else // !wxDEBUG_LEVEL