#include "coreapplication.h"
#include "core.h"
+#include "logger.h"
+
+CoreApplicationInternal::CoreApplicationInternal()
+ : _coreCreated(false)
+{
+ Q_INIT_RESOURCE(sql);
-CoreApplicationInternal::CoreApplicationInternal() {
// put core-only arguments here
CliParser *parser = Quassel::cliParser();
parser->addOption("port",'p', tr("The port quasselcore will listen at"), QString("4242"));
}
CoreApplicationInternal::~CoreApplicationInternal() {
- Core::saveState();
- Core::destroy();
+ if(_coreCreated) {
+ Core::saveState();
+ Core::destroy();
+ }
}
bool CoreApplicationInternal::init() {
}
Core::instance(); // create and init the core
+ _coreCreated = true;
if(!Quassel::isOptionSet("norestore")) {
Core::restoreState();
/*****************************************************************************/
-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() {