Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-17 13:02:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding second prompt for merge.

Browse Source
This commit is contained in:
Louis-Bertrand Varin 2017-03-12 14:17:03 -04:00 committed by Louis-Bertrand Varin
parent cf23343911
commit fd9d372e6a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/Merge.cpp
View File

@ -52,7 +52,7 @@ int Merge::execute(int argc, char** argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
out << "Insert the database password\n> "; out << "Insert the first database password\n> ";
out.flush(); out.flush();
static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
@ -64,6 +64,8 @@ int Merge::execute(int argc, char** argv)
key2 = *key1.clone(); key2 = *key1.clone();
} }
else { else {
out << "Insert the second database password\n> ";
out.flush();
QString line2 = inputTextStream.readLine(); QString line2 = inputTextStream.readLine();
key2 = CompositeKey::readFromLine(line2); key2 = CompositeKey::readFromLine(line2);
} }