Fix quiet option for Merge (CLI) (#2695)

2019-02-15 08:56:29 -05:00
parent 8cf3ee866e
commit fa3c959212
2 changed files with 12 additions and 1 deletions
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -78,7 +78,10 @@ int Merge::execute(const QStringList& arguments)

    QSharedPointer<Database> db2;
    if (!parser.isSet("same-credentials")) {
-        db2 = Utils::unlockDatabase(args.at(1), parser.value(keyFileFromOption), Utils::STDOUT, Utils::STDERR);
+        db2 = Utils::unlockDatabase(args.at(1),
+                                    parser.value(keyFileFromOption),
+                                    parser.isSet(Command::QuietOption) ? Utils::DEVNULL : Utils::STDOUT,
+                                    Utils::STDERR);
        if (!db2) {
            return EXIT_FAILURE;
        }