Fixes #682 - Core crashes on client connection

[quassel.git] / src / common / main.cpp

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 21d066e..6aff6db 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -84,7 +84,12 @@ int main(int argc, char **argv) {
   // put shared client&core arguments here
   cliParser->addSwitch("debug",'d', "Enable debug output");
   cliParser->addSwitch("help",'h', "Display this help and exit");
-  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert");
+  cliParser->addSwitch("version", 'v', "Display version information");
+#ifdef BUILD_QTUI
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding the client configuration");
+#else
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate");
+#endif
   cliParser->addOption("datadir <path>", 0, "DEPRECATED - Use --configdir instead");
 
 #ifndef BUILD_CORE
@@ -101,6 +106,7 @@ int main(int argc, char **argv) {
   cliParser->addOption("loglevel <level>", 'L', "Loglevel Debug|Info|Warning|Error", "Info");
   cliParser->addOption("select-backend <backendidentifier>", 0, "Starts an interactive session and switches your current storage backend to the new one. Attempts a merge if the new backend is uninitialized and the old backend supports migration. Otherwise prompts for new user credentials!");
   cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user");
+  cliParser->addOption("change-userpass <username>", 0, "Starts an interactive session to change the password of the user identified by username");
 #endif
 
 #ifdef HAVE_KDE