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

Fix unit test crash

Browse Source
This commit is contained in:
Janek Bevendorff 2017-02-24 19:47:03 +01:00
parent 434d0fb1c0
commit 46942413db
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/MainWindow.h
View File

@ -109,6 +109,7 @@ private:
bool appExitCalled; bool appExitCalled;
}; };
#define KEEPASSXC_MAIN_WINDOW qobject_cast<MainWindow*>(qobject_cast<Application*>(qApp)->mainWindow()) #define KEEPASSXC_MAIN_WINDOW (qobject_cast<Application*>(qApp) ? \
qobject_cast<MainWindow*>(qobject_cast<Application*>(qApp)->mainWindow()) : nullptr)
#endif // KEEPASSX_MAINWINDOW_H #endif // KEEPASSX_MAINWINDOW_H

2
src/keys/YkChallengeResponseKey.cpp
View File

@ -33,9 +33,11 @@ YkChallengeResponseKey::YkChallengeResponseKey(int slot, bool blocking)
: m_slot(slot), : m_slot(slot),
m_blocking(blocking) m_blocking(blocking)
{ {
if (KEEPASSXC_MAIN_WINDOW) {
connect(this, SIGNAL(userInteractionRequired()), KEEPASSXC_MAIN_WINDOW, SLOT(showYubiKeyPopup())); connect(this, SIGNAL(userInteractionRequired()), KEEPASSXC_MAIN_WINDOW, SLOT(showYubiKeyPopup()));
connect(this, SIGNAL(userConfirmed()), KEEPASSXC_MAIN_WINDOW, SLOT(hideYubiKeyPopup())); connect(this, SIGNAL(userConfirmed()), KEEPASSXC_MAIN_WINDOW, SLOT(hideYubiKeyPopup()));
} }
}
QByteArray YkChallengeResponseKey::rawKey() const QByteArray YkChallengeResponseKey::rawKey() const
{ {