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

Merge pull request #1975 from keepassxreboot/hotfix/prevent-locked-merge

Browse Source 
Disable merge when database is locked
This commit is contained in:
Janek Bevendorff 2018-05-19 07:37:45 +02:00 committed by GitHub
commit b9fa06c890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/DatabaseTabWidget.cpp
View File

@ -198,11 +198,14 @@ void DatabaseTabWidget::importCsv()
void DatabaseTabWidget::mergeDatabase() void DatabaseTabWidget::mergeDatabase()
{ {
QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files")); auto dbWidget = currentDatabaseWidget();
const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(), if (dbWidget && dbWidget->currentMode() != DatabaseWidget::LockedMode) {
filter); QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
if (!fileName.isEmpty()) { const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(),
mergeDatabase(fileName); filter);
if (!fileName.isEmpty()) {
mergeDatabase(fileName);
}
} }
} }

1
src/gui/MainWindow.cpp
View File

@ -647,7 +647,6 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget);
m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases());