projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only enable the relevant highlight depending on core features
[quassel.git]
/
src
/
core
/
coreapplication.cpp
diff --git
a/src/core/coreapplication.cpp
b/src/core/coreapplication.cpp
index
b9422b8
..
0806a2a
100644
(file)
--- a/
src/core/coreapplication.cpp
+++ b/
src/core/coreapplication.cpp
@@
-55,6
+55,11
@@
bool CoreApplicationInternal::init()
Core::instance(); // create and init the core
_coreCreated = true;
Core::instance(); // create and init the core
_coreCreated = true;
+ Quassel::registerReloadHandler([]() {
+ // Currently, only reloading SSL certificates is supported
+ return Core::reloadCerts();
+ });
+
if (!Quassel::isOptionSet("norestore"))
Core::restoreState();
if (!Quassel::isOptionSet("norestore"))
Core::restoreState();
@@
-65,13
+70,13
@@
bool CoreApplicationInternal::init()
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
- : QCoreApplication(argc, argv)
, Quassel()
+ : QCoreApplication(argc, argv)
{
#ifdef Q_OS_MAC
{
#ifdef Q_OS_MAC
-
disableCrashh
andler();
+
Quassel::disableCrashH
andler();
#endif /* Q_OS_MAC */
#endif /* Q_OS_MAC */
- setRunMode(Quassel::CoreOnly);
+
Quassel::
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
}
_internal = new CoreApplicationInternal();
}
@@
-79,6
+84,7
@@
CoreApplication::CoreApplication(int &argc, char **argv)
CoreApplication::~CoreApplication()
{
delete _internal;
CoreApplication::~CoreApplication()
{
delete _internal;
+ Quassel::destroy();
}
}