this should tackle sqlites issues with concurrent access

[quassel.git] / src / core / coreapplication.cpp

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 7098ab8..2cdc5a6 100644 (file)
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -21,10 +21,13 @@
 #include "coreapplication.h"
 
 #include "core.h"
+#include "logger.h"
 
-CoreApplicationInternal::CoreApplicationInternal() 
+CoreApplicationInternal::CoreApplicationInternal()
   : _coreCreated(false)
 {
+  Q_INIT_RESOURCE(sql);
+
   // put core-only arguments here
   CliParser *parser = Quassel::cliParser();
   parser->addOption("port",'p', tr("The port quasselcore will listen at"), QString("4242"));
@@ -65,9 +68,14 @@ bool CoreApplicationInternal::init() {
 
 /*****************************************************************************/
 
-CoreApplication::CoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv), Quassel() {
+CoreApplication::CoreApplication(int &argc, char **argv)
+  : QCoreApplication(argc, argv),
+    Quassel()
+{
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();
+
+  qInstallMsgHandler(Logger::logMessage);
 }
 
 CoreApplication::~CoreApplication() {