From 8bf372056f1290301b75e38eac367eb74306383d Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Mon, 23 Feb 2015 01:36:50 +0100
Subject: [PATCH] Use CMsgBoxDisplayer on non-windows platforms as well.

--HG--
branch : feature-crashreport
---
 code/nel/src/misc/debug.cpp     |  2 +-
 code/nel/src/misc/displayer.cpp |  4 +-
 code/nel/src/misc/report.cpp    | 79 ++++++++++++++++++---------------
 3 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp
index 3f0c26f69..86752a412 100644
--- a/code/nel/src/misc/debug.cpp
+++ b/code/nel/src/misc/debug.cpp
@@ -1197,10 +1197,10 @@ void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 
 #ifdef NL_OS_WINDOWS
 		if (TrapCrashInDebugger || !IsDebuggerPresent ())
+#endif
 		{
 			DefaultMsgBoxDisplayer = new CMsgBoxDisplayer ("DEFAULT_MBD");
 		}
-#endif
 
 #if LOG_IN_FILE
 		if (logInFile)
diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp
index d48c44d02..86fc1d726 100644
--- a/code/nel/src/misc/displayer.cpp
+++ b/code/nel/src/misc/displayer.cpp
@@ -529,7 +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
+//#ifdef NL_OS_WINDOWS
 
 	bool needSpace = false;
 //	stringstream ss;
@@ -720,7 +720,7 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
 		}
 */	}
 
-#endif
+//#endif
 }
 
 
diff --git a/code/nel/src/misc/report.cpp b/code/nel/src/misc/report.cpp
index 58740ce28..784f49a9a 100644
--- a/code/nel/src/misc/report.cpp
+++ b/code/nel/src/misc/report.cpp
@@ -63,19 +63,61 @@ void setReportEmailFunction (void *emailFunction)
 #endif
 }
 
+static string Body;
+static std::string URL = "FILL_IN_CRASH_REPORT_HOSTNAME_HERE";
+
+
+static void doSendReport()
+{
+    std::string filename;
+
+    filename = "report_";
+    filename += NLMISC::toString( int( time( NULL ) ) );
+    filename += ".txt";
+
+    std::string params;
+    params = "-log ";
+    params += filename;
+    params += " -host ";
+    params += URL;
+
+    std::ofstream f;
+    f.open( filename.c_str() );
+    if( !f.good() )
+        return;
+
+    f << Body;
+
+    f.close();
+
+#ifdef NL_OS_WINDOWS
+    NLMISC::launchProgram( "crash_report.exe", params );
+#else
+    NLMISC::launchProgram( "crash_report", params );
+#endif
+
+    // Added because NLSMIC::launcProgram needs time to launch
+    nlSleep( 2 * 1000 );
+
+}
+
 #ifndef NL_OS_WINDOWS
 
 // GNU/Linux, do nothing
 
-void report ()
+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)
 {
+    Body = addSlashR( body );
+
+    doSendReport();
+
+    return ReportQuit;
 }
 
 #else
 
 // Windows specific version
 
-static string Body;
 static string Subject;
 static string AttachedFile;
 
@@ -92,39 +134,6 @@ static bool CanSendMailReport= false;
 
 static bool DebugDefaultBehavior, QuitDefaultBehavior;
 
-static std::string URL = "FILL_IN_CRASH_REPORT_HOSTNAME_HERE";
-
-static void doSendReport()
-{
-	std::string filename;
-
-	filename = "report_";
-	filename += NLMISC::toString( time( NULL ) );
-	filename += ".txt";
-
-	std::string params;
-	params = "-log ";
-	params += filename;
-	params += " -host ";
-	params += URL;
-
-	std::ofstream f;
-	f.open( filename.c_str() );
-	if( !f.good() )
-		return;
-
-	f << Body;
-
-	f.close();
-
-#ifdef NL_OS_WINDOWS
-	NLMISC::launchProgram( "crash_report.exe", params );
-#else
-	NLMISC::launchProgram( "crash_report", params );
-#endif
-
-}
-
 static void sendEmail()
 {
 	if (CanSendMailReport && SendMessage(sendReport, BM_GETCHECK, 0, 0) != BST_CHECKED)