Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 03:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trezor: fix splashdialog hide on pin cancel

Browse source
This commit is contained in:
tobtoht 2021-07-07 04:38:15 +02:00
parent 4b747bf163
commit f2a72c342e
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/WindowManager.cpp
View file

@ -22,6 +22,7 @@ WindowManager::WindowManager() {
connect(m_walletManager, &WalletManager::walletOpened, this, &WindowManager::onWalletOpened); connect(m_walletManager, &WalletManager::walletOpened, this, &WindowManager::onWalletOpened);
connect(m_walletManager, &WalletManager::walletCreated, this, &WindowManager::onWalletCreated); connect(m_walletManager, &WalletManager::walletCreated, this, &WindowManager::onWalletCreated);
connect(m_walletManager, &WalletManager::deviceButtonRequest, this, &WindowManager::onDeviceButtonRequest); connect(m_walletManager, &WalletManager::deviceButtonRequest, this, &WindowManager::onDeviceButtonRequest);
connect(m_walletManager, &WalletManager::deviceButtonPressed, this, &WindowManager::onDeviceButtonPressed);
connect(m_walletManager, &WalletManager::deviceError, this, &WindowManager::onDeviceError); connect(m_walletManager, &WalletManager::deviceError, this, &WindowManager::onDeviceError);
connect(qApp, &QGuiApplication::lastWindowClosed, this, &WindowManager::quitAfterLastWindow); connect(qApp, &QGuiApplication::lastWindowClosed, this, &WindowManager::quitAfterLastWindow);
@ -374,6 +375,10 @@ void WindowManager::onDeviceButtonRequest(quint64 code) {
m_splashDialog->setEnabled(true); m_splashDialog->setEnabled(true);
} }
void WindowManager::onDeviceButtonPressed() {
m_splashDialog->hide();
}
void WindowManager::onDeviceError(const QString &errorMessage) { void WindowManager::onDeviceError(const QString &errorMessage) {
// TODO: when does this get called? // TODO: when does this get called?
qCritical() << Q_FUNC_INFO << errorMessage; qCritical() << Q_FUNC_INFO << errorMessage;

1
src/WindowManager.h
View file

@ -39,6 +39,7 @@ private slots:
void onWalletOpenPasswordRequired(bool invalidPassword, const QString &path); void onWalletOpenPasswordRequired(bool invalidPassword, const QString &path);
void onInitialNetworkConfigured(); void onInitialNetworkConfigured();
void onDeviceButtonRequest(quint64 code); void onDeviceButtonRequest(quint64 code);
void onDeviceButtonPressed();
void onDeviceError(const QString &errorMessage); void onDeviceError(const QString &errorMessage);
private: private:

10
src/libwalletqt/WalletManager.cpp
View file

@ -36,11 +36,11 @@ public:
emit m_mgr->deviceButtonRequest(code); emit m_mgr->deviceButtonRequest(code);
} }
// //
// virtual void onDeviceButtonPressed() override virtual void onDeviceButtonPressed() override
// { {
// qDebug() << __FUNCTION__; qDebug() << __FUNCTION__;
// emit m_mgr->deviceButtonPressed(); emit m_mgr->deviceButtonPressed();
// } }
virtual void onDeviceError(const std::string &message) override virtual void onDeviceError(const std::string &message) override
{ {