github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: ASSERT now does not show stack-trace, unless flagSTACKTRACE

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7000 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-03-06 08:18:09 +00:00
parent 1a4adfe19f
commit 692d86a1fe
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Util.cpp
View file

@ -135,7 +135,7 @@ void AssertFailed(const char *file, int line, const char *cond)
PanicMode = true;
char s[2048];
sprintf(s, "Assertion failed in %s, line %d\n%s\n", file, line, cond);
#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC)
#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC) && defined(flagSTACKTRACE)
AddStackTrace(s, sizeof(s));
#endif

1
uppsrc/CtrlCore/X11App.cpp
View file

@ -206,6 +206,7 @@ void sPanicMessageBox(const char *title, const char *text)
XEvent e;
XNextEvent(display, &e);
switch(e.type) {
case KeyPress:
case ButtonPress:
XFreeFont(display, font_info);
XFreeGC(display, gc);