X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=4795349edaf25f021bfb3cb0302a294c10f23037;hp=4aca18565d242a2256c89c1600488e8c66e15a30;hb=4f15a69a3150f180bd93fcbe1c87dbaca92a77ad;hpb=22c2ccf1889b076d55be487aa3e1fe761e42faaa diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index 4aca185..4795349 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.24 2003/03/15 14:52:36 kevin Exp $ +** $Id: syserror.cpp,v 1.25 2003/03/23 18:37:42 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -57,9 +57,11 @@ void sys_error (int severity, const char *msg, ...) if (theApp) { wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); wxString msg (strOutput.c_str()); - msg += "\n"; - eventLog.SetString( msg ); - wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe + if (msg.length() > 0) { + msg += "\n"; + eventLog.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe + } } else { wxMutexGuiEnter(); wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL)); @@ -67,14 +69,16 @@ void sys_error (int severity, const char *msg, ...) } } else -#endif std::cout << strOutput << "\n"; +#else + std::cout << strOutput << "\n"; +#endif va_end(arg); } -static int s_nErrorCount = 0; -const static int MAX_ERROR_COUNT = 20; +static unsigned long s_nErrorCount = 0; +unsigned long int g_lSysErrorMaxCount = 2000; void sys_verror (std::string& strOutput, int severity, const char *msg, va_list arg) @@ -88,9 +92,9 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list s_nErrorCount++; if (severity != ERR_FATAL) { - if (s_nErrorCount > MAX_ERROR_COUNT) + if (s_nErrorCount > g_lSysErrorMaxCount) return; - else if (s_nErrorCount == MAX_ERROR_COUNT) { + else if (s_nErrorCount == g_lSysErrorMaxCount) { os << "*****************************************************************\n"; os << "*** M A X I M U M E R R O R C O U N T R E A C H E D ***\n"; os << "*** ***\n";