mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Development

Browse Source
This commit is contained in:
Manfred Karrer 2017-07-03 02:37:24 +02:00
commit f5479eca2c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/io/bisq/core/btc/wallet/WalletsManager.java
View File

@ -93,7 +93,9 @@ public class WalletsManager {
}
public boolean areWalletsEncrypted() {
return btcWalletService.isEncrypted() && (!BisqEnvironment.isBaseCurrencySupportingBsq() || bsqWalletService.isEncrypted());
return areWalletsAvailable() &&
btcWalletService.isEncrypted() &&
(!BisqEnvironment.isBaseCurrencySupportingBsq() || bsqWalletService.isEncrypted());
}
public boolean areWalletsAvailable() {

2
gui/src/main/java/io/bisq/gui/main/MainViewModel.java
View File

@ -334,7 +334,7 @@ public class MainViewModel implements ViewModel {
Timer startupTimeout = UserThread.runAfter(() -> {
log.warn("startupTimeout called");
if (walletsManager.areWalletsAvailable() && walletsManager.areWalletsEncrypted())
if (walletsManager.areWalletsEncrypted())
walletInitialized.addListener(walletInitializedListener);
else
showStartupTimeoutPopup();