Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-27 03:41:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github/pr/96'

Browse source 
Closes #218
This commit is contained in:
Felix Geyer 2015-05-12 23:35:19 +02:00
commit 7e1faadd11
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/ChangeMasterKeyWidget.cpp
View file

@ -120,7 +120,10 @@ void ChangeMasterKeyWidget::generateKey()
FileKey fileKey; FileKey fileKey;
QString errorMsg; QString errorMsg;
if (!fileKey.load(m_ui->keyFileCombo->currentText(), &errorMsg)) { if (!fileKey.load(m_ui->keyFileCombo->currentText(), &errorMsg)) {
// TODO: error handling MessageBox::critical(this, tr("Failed to set key file"),
tr("Failed to set %1 as the Key file:\n%2")
.arg(m_ui->keyFileCombo->currentText(), errorMsg));
return;
} }
m_key.addKey(fileKey); m_key.addKey(fileKey);
} }