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

FdoSecrets: only emit completed signal when the action actually finishes

Browse Source
This commit is contained in:
Aetf
2019-12-13 15:28:45 -05:00
committed by Jonathan White
parent af14929af1
commit adb29dd0e4
10 changed files with 71 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/fdosecrets/objects/Service.cpp
View File

@@ -47,6 +47,8 @@ namespace FdoSecrets
, m_insdieEnsureDefaultAlias(false)
, m_serviceWatcher(nullptr)
{
connect(
m_databases, &DatabaseTabWidget::databaseUnlockDialogFinished, this, &Service::doneUnlockDatabaseInDialog);
}
Service::~Service()
@@ -447,9 +449,9 @@ namespace FdoSecrets
return m_sessions;
}
void Service::doCloseDatabase(DatabaseWidget* dbWidget)
bool Service::doCloseDatabase(DatabaseWidget* dbWidget)
{
m_databases->closeDatabaseTab(dbWidget);
return m_databases->closeDatabaseTab(dbWidget);
}
Collection* Service::doNewDatabase()
@@ -472,11 +474,10 @@ namespace FdoSecrets
void Service::doSwitchToChangeDatabaseSettings(DatabaseWidget* dbWidget)
{
// switch selected to current
// unlock if needed
if (dbWidget->isLocked()) {
m_databases->unlockDatabaseInDialog(dbWidget, DatabaseOpenDialog::Intent::None);
return;
}
// switch selected to current
m_databases->setCurrentWidget(dbWidget);
m_databases->changeDatabaseSettings();