Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Backed out from 5942903

Browse source
This commit is contained in:
dfighter1985 2015-02-22 17:20:24 +01:00
parent 32acbd5297
commit 6be000a530
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/misc/debug.cpp
View file

@ -1193,7 +1193,13 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
INelContext::getInstance().setAssertLog(new CLog (CLog::LOG_ASSERT));
sd = new CStdDisplayer ("DEFAULT_SD");
DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
#ifdef NL_OS_WINDOWS
if (TrapCrashInDebugger || !IsDebuggerPresent ())
{
DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
}
#endif
#if LOG_IN_FILE
if (logInFile)

2
code/nel/src/misc/displayer.cpp
View file

@ -529,6 +529,7 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
// in release "<Msg>"
void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
{
#ifdef NL_OS_WINDOWS
bool needSpace = false;
// stringstream ss;
@ -719,6 +720,7 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
}
*/ }
#endif
}

12
code/nel/src/misc/report.cpp
View file

@ -52,6 +52,16 @@ void setReportEmailFunction (void *emailFunction)
EmailFunction = (TEmailFunction)emailFunction;
}
#ifndef NL_OS_WINDOWS
// GNU/Linux, do nothing
void report ()
{
}
#else
TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
{
std::string fname = "rcerrorlog.txt";
@ -82,5 +92,7 @@ TReportResult report (const std::string &title, const std::string &header, const
return ReportQuit;
}
#endif
} // NLMISC