From 070dad8e53ff2b703fedf82320be599e3269ba71 Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Sat, 21 Feb 2015 21:28:56 +0100
Subject: [PATCH] Use CMsgBoxDisplayer on platforms other than Windows as well.

--HG--
branch : hotfix
---
 code/nel/src/misc/debug.cpp     |  8 +-------
 code/nel/src/misc/displayer.cpp |  2 --
 code/nel/src/misc/report.cpp    | 12 ------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp
index 2d09f5ef8..aaa551f1f 100644
--- a/code/nel/src/misc/debug.cpp
+++ b/code/nel/src/misc/debug.cpp
@@ -1193,13 +1193,7 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 		INelContext::getInstance().setAssertLog(new CLog (CLog::LOG_ASSERT));
 
 		sd = new CStdDisplayer ("DEFAULT_SD");
-
-#ifdef NL_OS_WINDOWS
-		if (TrapCrashInDebugger || !IsDebuggerPresent ())
-		{
-			DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
-		}
-#endif
+        DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
 
 #if LOG_IN_FILE
 		if (logInFile)
diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp
index d48c44d02..35ae27964 100644
--- a/code/nel/src/misc/displayer.cpp
+++ b/code/nel/src/misc/displayer.cpp
@@ -529,7 +529,6 @@ 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;
@@ -720,7 +719,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
 		}
 */	}
 
-#endif
 }
 
 
diff --git a/code/nel/src/misc/report.cpp b/code/nel/src/misc/report.cpp
index 88c707aaa..b165e29f5 100644
--- a/code/nel/src/misc/report.cpp
+++ b/code/nel/src/misc/report.cpp
@@ -52,16 +52,6 @@ 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";
@@ -92,7 +82,5 @@ TReportResult report (const std::string &title, const std::string &header, const
 	return ReportQuit;
 }
 
-#endif
-
 
 } // NLMISC