projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more fixes
[quassel.git]
/
src
/
core
/
coreapplication.cpp
diff --git
a/src/core/coreapplication.cpp
b/src/core/coreapplication.cpp
index
99fcfd8
..
9ad452e
100644
(file)
--- a/
src/core/coreapplication.cpp
+++ b/
src/core/coreapplication.cpp
@@
-63,16
+63,14
@@
bool CoreApplicationInternal::init() {
CoreApplication::CoreApplication(int &argc, char **argv)
#ifdef HAVE_KDE
CoreApplication::CoreApplication(int &argc, char **argv)
#ifdef HAVE_KDE
- : KApplication(false),
+: KApplication(false), Quassel() {
+ Q_UNUSED(argc); Q_UNUSED(argv);
#else
#else
- : QCoreApplication(argc, argv),
+: QCoreApplication(argc, argv), Quassel() {
#endif
#endif
- Quassel()
-{
+
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
-
- qInstallMsgHandler(Logger::logMessage);
}
CoreApplication::~CoreApplication() {
}
CoreApplication::~CoreApplication() {
@@
-80,7
+78,9
@@
CoreApplication::~CoreApplication() {
}
bool CoreApplication::init() {
}
bool CoreApplication::init() {
- if(Quassel::init())
- return _internal->init();
+ if(Quassel::init() && _internal->init()) {
+ qInstallMsgHandler(Logger::logMessage);
+ return true;
+ }
return false;
}
return false;
}