jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistency using filepath and minor code fixes

Browse Source
This commit is contained in:
Jonathan White
2017-12-20 10:18:01 -05:00
parent 36e5377e6a
commit 1a7b874c60
5 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/DatabaseTabWidget.cpp
View File

@@ -355,9 +355,9 @@ bool DatabaseTabWidget::saveDatabaseAs(Database* db)
} else {
oldFilePath = QDir::toNativeSeparators(QDir::homePath() + "/" + tr("Passwords").append(".kdbx"));
}
QString newFilePath = fileDialog()->getSaveFileName(this, tr("Save database as"),
oldFilePath, tr("KeePass 2 Database").append(" (*.kdbx)"),
nullptr, 0, "kdbx");
QString newFilePath = fileDialog()->getSaveFileName(this, tr("Save database as"), oldFilePath,
tr("KeePass 2 Database").append(" (*.kdbx)"),
nullptr, 0, "kdbx");
if (!newFilePath.isEmpty()) {
// Ensure we don't recurse back into this function
dbStruct.readOnly = false;
@@ -367,7 +367,7 @@ bool DatabaseTabWidget::saveDatabaseAs(Database* db)
continue;
}
dbStruct.dbWidget->updateFilename(dbStruct.fileInfo.absoluteFilePath());
dbStruct.dbWidget->updateFilePath(dbStruct.fileInfo.absoluteFilePath());
updateLastDatabases(dbStruct.fileInfo.absoluteFilePath());
return true;
}
@@ -669,7 +669,7 @@ void DatabaseTabWidget::lockDatabases()
DatabaseWidget* dbWidget = static_cast<DatabaseWidget*>(widget(i));
Database* db = databaseFromDatabaseWidget(dbWidget);
if (dbWidget->currentMode() == DatabaseWidget::LockedMode) {
if (dbWidget->currentMode() == DatabaseWidget::LockedMode || !dbWidget->dbHasKey()) {
continue;
}