X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=d4833a4f6b99e24c88ebd2282ba670d5e92e009c;hb=refs%2Fpull%2F111%2Fhead;hp=9d75da4ec12263cfe48b2204b650c77caaf36b35;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 9d75da4e..d4833a4f 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -161,7 +161,7 @@ int main(int argc, char **argv) cliParser->addSwitch("oidentd", 0, "Enable oidentd integration"); cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file"); #ifdef HAVE_SSL - cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections"); + cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections"); #endif cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif @@ -190,9 +190,6 @@ int main(int argc, char **argv) } #endif - if (!app.init()) - return EXIT_FAILURE; - #ifdef HAVE_KF5 // FIXME: This should be done after loading the translation catalogue, but still in main() AboutData aboutData; @@ -200,5 +197,8 @@ int main(int argc, char **argv) KAboutData::setApplicationData(aboutData.kAboutData()); #endif + if (!app.init()) + return EXIT_FAILURE; + return app.exec(); }