Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes bug #1185 where the password from the CLI wouldn't be send to KeePassXC #1336

Closed
wants to merge 15 commits into from
Closed

Fixes bug #1185 where the password from the CLI wouldn't be send to KeePassXC #1336

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1010674
Update main.cpp
TheChiefMeat Dec 28, 2017
9258d3d
Update main.cpp
TheChiefMeat Dec 28, 2017
38262aa
Update main.cpp
TheChiefMeat Dec 28, 2017
34a0d0a
Update main.cpp
TheChiefMeat Dec 29, 2017
c626219
Update main.cpp
TheChiefMeat Dec 29, 2017
58da2cc
Update main.cpp
TheChiefMeat Dec 29, 2017
df8d8cc
Update main.cpp
TheChiefMeat Dec 29, 2017
03f555d
Update main.cpp
TheChiefMeat Dec 29, 2017
669f15b
Update main.cpp
TheChiefMeat Dec 29, 2017
3904d4b
Update main.cpp
TheChiefMeat Dec 29, 2017
7eef601
Update main.cpp
TheChiefMeat Dec 29, 2017
1ffcbc7
Update main.cpp
TheChiefMeat Dec 29, 2017
70281d9
Merge branch 'develop' into develop
TheChiefMeat Dec 29, 2017
1369c0b
Merge branch 'develop' into develop
TheChiefMeat Jan 17, 2018
5304a91
Update main.cpp
TheChiefMeat Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ int main(int argc, char** argv)
QCommandLineOption parentWindowOption(QStringList() << "pw"
<< "parent-window",
QCoreApplication::translate("main", "Parent window handle"),
"handle");
"handle");

parser.addHelpOption();
parser.addVersionOption();
Expand Down Expand Up @@ -149,6 +149,11 @@ int main(int argc, char** argv)
static QTextStream in(stdin, QIODevice::ReadOnly);
password = in.readLine();
}
#ifdef Q_OS_WIN
mainWindow.openDatabase(filename, parser.value(pwstdinOption), parser.value(keyfileOption));
#else
mainWindow.openDatabase(filename, password, parser.value(keyfileOption));
#endif
}
}

Expand Down