Update image-server logic.

[flightgear.git] / src / Main / bootstrap.cxx

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 96b053b61b2830afe4127bcfe6a767e3992e63d0..326401a7573b3e556d4f93d43de53af31d470afa 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -73,6 +73,9 @@ using std::endl;
 
 #if defined(HAVE_CRASHRPT)
        #include <CrashRpt.h>
+
+bool global_crashRptEnabled = false;
+
 #endif
 
 std::string homedir;
@@ -201,7 +204,7 @@ int main ( int argc, char **argv )
        // Restart the app on crash 
        info.dwFlags |= CR_INST_SEND_QUEUED_REPORTS; 
 
-       // autoamticallty install handlers for all threads
+       // automatically install handlers for all threads
        info.dwFlags |= CR_INST_AUTO_THREAD_HANDLERS;
 
        // Define the Privacy Policy URL 
@@ -210,9 +213,18 @@ int main ( int argc, char **argv )
        // Install crash reporting
        int nResult = crInstall(&info);    
        if(nResult!=0) {
-               std::cerr << "failed to install crash reporting engine" << std::endl;
+               char buf[1024];
+               crGetLastErrorMsg(buf, 1024);
+               flightgear::modalMessageBox("CrashRpt setup failed", 
+                       "Failed to setup crash-reporting engine, check the installation is not damaged.",
+                       buf);
        } else {
-               crAddProperty("hudson-build-id", HUDSON_BUILD_ID); 
+               global_crashRptEnabled = true;
+
+               crAddProperty("hudson-build-id", HUDSON_BUILD_ID);
+               char buf[16];
+               ::snprintf(buf, 16, "%d", HUDSON_BUILD_NUMBER);
+               crAddProperty("hudson-build-number", buf);
        }
 #endif