Move crashcatcher initialization to components

apps/opencs/editor.cpp

@@ -5,9 +5,6 @@
 #include <QLocalSocket>
 #include <QMessageBox>
 
-
-#include <components/crashcatcher/crashcatcher.hpp>
-
 #include <components/fallback/validate.hpp>
 
 #include <components/nifosg/nifloader.hpp>
@@ -27,10 +24,6 @@ CS::Editor::Editor (int argc, char **argv)
   mLock(), mMerge (mDocumentManager),
   mIpcServerName ("org.openmw.OpenCS"), mServer(NULL), mClientSocket(NULL)
 {    
-    // install the crash handler as soon as possible. note that the log path
-    // does not depend on config being read.
-    crashCatcherInstall(argc, argv, (mCfgMgr.getLogPath() / "openmw-cs-crash.log").string());
-
     std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
 
     setupDataFiles (config.first);

apps/openmw/main.cpp

@@ -1,7 +1,6 @@
 #include <iostream>
 
 #include <components/version/version.hpp>
-#include <components/crashcatcher/crashcatcher.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/files/escape.hpp>
 #include <components/fallback/validate.hpp>

components/debug/debugging.cpp

@@ -1,5 +1,7 @@
 #include "debugging.hpp"
 
+#include <components/crashcatcher/crashcatcher.hpp>
+
 namespace Debug
 {
     std::streamsize DebugOutputBase::write(const char *str, std::streamsize size)
@@ -61,12 +63,14 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
 #endif
 
     const std::string logName = Misc::StringUtils::lowerCase(appName) + ".log";
+    const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.log";
     boost::filesystem::ofstream logfile;
 
     int ret = 0;
     try
     {
         Files::ConfigurationManager cfgMgr;
+
 #if defined(_WIN32) && defined(_DEBUG)
         // Redirect cout and cerr to VS debug output when running in debug mode
         boost::iostreams::stream_buffer<Debug::DebugOutput> sb;
@@ -85,6 +89,11 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
         std::cout.rdbuf (&coutsb);
         std::cerr.rdbuf (&cerrsb);
 #endif
+
+        // install the crash handler as soon as possible. note that the log path
+        // does not depend on config being read.
+        crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / crashLogName).string());
+
         ret = innerApplication(argc, argv);
     }
     catch (std::exception& e)