log level revert and minor startup fixes

sparrowwallet · Jan 13, 2021 · 64a9cce · 64a9cce
1 parent caa7ef4
commit 64a9cce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppServices.java b/src/main/java/com/sparrowwallet/sparrow/AppServices.java
@@ -441,11 +441,13 @@ public void feeRateSourceChanged(FeeRatesSourceChangedEvent event) {
 
     @Subscribe
     public void fiatCurrencySelected(FiatCurrencySelectedEvent event) {
-        ratesService.cancel();
+        if(ratesService != null) {
+            ratesService.cancel();
 
-        if(Config.get().getMode() != Mode.OFFLINE && event.getExchangeSource() != ExchangeSource.NONE) {
-            ratesService = createRatesService(event.getExchangeSource(), event.getCurrency());
-            ratesService.start();
+            if(Config.get().getMode() != Mode.OFFLINE && event.getExchangeSource() != ExchangeSource.NONE) {
+                ratesService = createRatesService(event.getExchangeSource(), event.getCurrency());
+                ratesService.start();
+            }
         }
     }
 

diff --git a/src/main/java/com/sparrowwallet/sparrow/net/Bwt.java b/src/main/java/com/sparrowwallet/sparrow/net/Bwt.java
@@ -96,7 +96,7 @@ private void start(List<String> outputDescriptors, Integer rescanSince, Boolean
         }
 
         bwtConfig.verbose = log.isDebugEnabled() ? 2 : 0;
-        if(!log.isInfoEnabled()) {
+        if(!log.isDebugEnabled()) {
             bwtConfig.setupLogger = false;
         }
 

diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/GeneralPreferencesController.java b/src/main/java/com/sparrowwallet/sparrow/preferences/GeneralPreferencesController.java
@@ -58,6 +58,8 @@ public void changed(ObservableValue<? extends Currency> observable, Currency old
     public void initializeView(Config config) {
         if(config.getBitcoinUnit() != null) {
             bitcoinUnit.setValue(config.getBitcoinUnit());
+        } else {
+            bitcoinUnit.setValue(BitcoinUnit.AUTO);
         }
 
         bitcoinUnit.valueProperty().addListener((observable, oldValue, newValue) -> {

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -22,7 +22,7 @@
         </encoder>
     </appender>
 
-    <root level="debug">
+    <root level="info">
         <appender-ref ref="FILE" />
         <appender-ref ref="STDOUT" />
     </root>