3 files changed, 6 insertions, 9 deletions
diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index ed02c2b1f..919ab6df4 100644
--- a/src/app/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
@@ -87,9 +87,7 @@ const QStringList BuiltinCommandLineOption::helpString() const
             << QString("--add-dir") + "||" + tr("Display Add Directory dialog");
 }
 
-QString BuiltinCommandLineOption::executeCommand(const QString &option_string,
-                                              const QStringList &args,
-                                              const QString &cwd)
+QString BuiltinCommandLineOption::executeCommand(const QString &option_string, const QStringList &args, const QString &cwd)
 {
     SoundCore *core = SoundCore::instance();
     MediaPlayer *player = MediaPlayer::instance();
diff --git a/src/app/builtincommandlineoption.h b/src/app/builtincommandlineoption.h
index 43bc4abdd..9121ebf76 100644
--- a/src/app/builtincommandlineoption.h
+++ b/src/app/builtincommandlineoption.h
@@ -44,8 +44,7 @@ public:
 
     bool identify(const QString& str) const;
     const QStringList helpString() const;
-    QString executeCommand(const QString& option, const QStringList &args,
-                        const QString &cwd);
+    QString executeCommand(const QString &option, const QStringList &args, const QString &cwd);
     QHash <QString, QStringList> splitArgs(const QStringList &args) const;
 
 private slots:
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index 2c7af2b89..323edc049 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -74,13 +74,13 @@ QMMPStarter::QMMPStarter() : QObject()
     argString = tmp.join("|||");
     QHash <QString, QStringList> commands = m_option_manager->splitArgs(tmp);
 
-    if(commands.keys().contains("--help"))
+    if(commands.keys().contains("--help") || commands.keys().contains("-h"))
     {
         printUsage();
         m_finished = true;
         return;
     }
-    if(commands.keys().contains("--version"))
+    if(commands.keys().contains("--version") || commands.keys().contains("-v"))
     {
         printVersion();
         m_finished = true;
@@ -403,8 +403,8 @@ void QMMPStarter::printUsage()
     extraHelp << QString("--ui <name>") + "||" + tr("Start qmmp with the specified user interface");
     extraHelp << QString("--ui-list") + "||" + tr("List all available user interfaces");
     extraHelp << QString("--no-start") + "||" + tr("Don't start the application");
-    extraHelp << QString("--help") + "||" + tr("Display this text and exit");
-    extraHelp << QString("--version") + "||" + tr("Print version number and exit");
+    extraHelp << QString("-h, --help") + "||" + tr("Display this text and exit");
+    extraHelp << QString("-v, --version") + "||" + tr("Print version number and exit");
     extraHelp << "";
     extraHelp << tr("Home page: %1").arg("http://qmmp.ylsoftware.com");
     extraHelp << tr("Development page: %1").arg("https://sourceforge.net/p/qmmp-dev");