]> git.saurik.com Git - wxWidgets.git/commitdiff
don't crash in wxFAIL and wxCHECK if assertion handler is NULL
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 25 Mar 2009 13:31:38 +0000 (13:31 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 25 Mar 2009 13:31:38 +0000 (13:31 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/debug.h

index 29d4deac3b6cfb3f53a451f41953f9c451e2cca4..593af341d7503b5b5b343633ed2312c273dec35b 100644 (file)
@@ -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