diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index 67af3ff1..892c41d3 100644 --- a/src/gui/DatabaseOpenWidget.cpp +++ b/src/gui/DatabaseOpenWidget.cpp @@ -143,7 +143,7 @@ void DatabaseOpenWidget::load(const QString& filename) QHash useTouchID = config()->get("UseTouchID").toHash(); m_ui->checkTouchID->setChecked(useTouchID.value(m_filename, false).toBool()); - + m_ui->editPassword->setFocus(); } @@ -195,9 +195,9 @@ void DatabaseOpenWidget::openDatabase() MessageWidget::Error); return; } - if (m_db) { - delete m_db; - } + + delete m_db; + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); m_db = reader.readDatabase(&file, masterKey); QApplication::restoreOverrideCursor(); @@ -254,7 +254,7 @@ QSharedPointer DatabaseOpenWidget::databaseKey() // check if the user cancelled the operation if (passwordKey.isNull()) return QSharedPointer(); - + masterKey->addKey(PasswordKey::fromRawKey(*passwordKey)); } } diff --git a/src/gui/KeePass1OpenWidget.cpp b/src/gui/KeePass1OpenWidget.cpp index 4a54aaf3..8123d239 100644 --- a/src/gui/KeePass1OpenWidget.cpp +++ b/src/gui/KeePass1OpenWidget.cpp @@ -53,9 +53,9 @@ void KeePass1OpenWidget::openDatabase() MessageWidget::Error); return; } - if (m_db) { - delete m_db; - } + + delete m_db; + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); m_db = reader.readDatabase(&file, password, keyFileName); QApplication::restoreOverrideCursor();