Add the GUI prompt option to the merge command. (#589)

2017-05-25 13:07:24 -04:00
parent c3bd5d21aa
commit dcc8094ce4
2 changed files with 32 additions and 21 deletions
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -403,7 +403,7 @@ Database* Database::unlockFromStdin(QString databaseFilename)
    static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
    QTextStream outputTextStream(stdout);

-    outputTextStream << QString("Insert password to unlock " + databaseFilename + "\n>");
+    outputTextStream << QString("Insert password to unlock " + databaseFilename + "\n> ");
    outputTextStream.flush();

    QString line = inputTextStream.readLine();