From c19df0130b478fd5135fb46a7dede1c047c8dd25 Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@foxsec.net>
Date: Fri, 29 Jun 2018 20:46:33 -0400
Subject: [PATCH] Allows printing version with -v when an instance is already
 running

Fixes #1362 by checking if the -v argument was used when deciding
whether to print the "keepassxc is already running" error message
---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a3dd14aae..687988762 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -96,7 +96,7 @@ int main(int argc, char** argv)
                                           "handle");
 
     parser.addHelpOption();
-    parser.addVersionOption();
+    QCommandLineOption versionOption = parser.addVersionOption();
     parser.addOption(configOption);
     parser.addOption(keyfileOption);
     parser.addOption(pwstdinOption);
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
     parser.process(app);
     const QStringList fileNames = parser.positionalArguments();
 
-    if (app.isAlreadyRunning()) {
+    if (app.isAlreadyRunning() && !parser.isSet(versionOption)) {
         if (!fileNames.isEmpty()) {
             app.sendFileNamesToRunningInstance(fileNames);
         }