Add check for areWalletsAvailable

This commit is contained in:
Manfred Karrer 2017-07-03 02:30:45 +02:00
parent 6d5868eaa4
commit 3deb80d23c
2 changed files with 4 additions and 2 deletions

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() {

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();