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

Use CMsgBoxDisplayer on platforms other than Windows as well.

Browse source
This commit is contained in:
dfighter1985 2015-02-21 21:28:56 +01:00
parent adf9155484
commit 588519b1d1
3 changed files with 1 additions and 21 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,13 +1193,7 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
INelContext::getInstance().setAssertLog(new CLog (CLog::LOG_ASSERT)); INelContext::getInstance().setAssertLog(new CLog (CLog::LOG_ASSERT));
sd = new CStdDisplayer ("DEFAULT_SD"); 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 LOG_IN_FILE
if (logInFile) if (logInFile)

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

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

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

@ -52,16 +52,6 @@ void setReportEmailFunction (void *emailFunction)
EmailFunction = (TEmailFunction)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) 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"; std::string fname = "rcerrorlog.txt";
@ -92,7 +82,5 @@ TReportResult report (const std::string &title, const std::string &header, const
return ReportQuit; return ReportQuit;
} }
#endif
} // NLMISC } // NLMISC