laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-11 09:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bwt

Browse Source
This commit is contained in:
Craig Raw
2021-01-08 17:01:32 +02:00
parent 3e083b907d c68722e420
commit 72281233e1
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/MainApp.java
+7 -5
View File
@@ -28,8 +28,6 @@ import java.util.*;
import java.util.stream.Collectors;
public class MainApp extends Application {
private static final Logger log = LoggerFactory.getLogger(MainApp.class);
public static final String APP_NAME = "Sparrow";
public static final String APP_VERSION = "0.9.9";
public static final String APP_HOME_PROPERTY = "sparrow.home";
@@ -110,8 +108,8 @@ public class MainApp extends Application {
}
if(args.dir != null) {
log.info("Using configured Sparrow home folder of " + args.dir);
System.setProperty(APP_HOME_PROPERTY, args.dir);
getLogger().info("Using configured Sparrow home folder of " + args.dir);
}
if(args.network != null) {
@@ -122,7 +120,7 @@ public class MainApp extends Application {
try {
Network.set(Network.valueOf(envNetwork.toUpperCase()));
} catch(Exception e) {
log.warn("Invalid " + NETWORK_ENV_PROPERTY + " property: " + envNetwork);
getLogger().warn("Invalid " + NETWORK_ENV_PROPERTY + " property: " + envNetwork);
}
}
}
@@ -133,9 +131,13 @@ public class MainApp extends Application {
}
if(Network.get() != Network.MAINNET) {
log.info("Using " + Network.get() + " configuration");
getLogger().info("Using " + Network.get() + " configuration");
}
com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, argv);
}
private static Logger getLogger() {
return LoggerFactory.getLogger(MainApp.class);
}
}
src/main/java/com/sparrowwallet/sparrow/io/Config.java
+2 -1
View File
@@ -343,12 +343,13 @@ public class Config {
flush();
}
private void flush() {
private synchronized void flush() {
Gson gson = getGson();
try {
File configFile = getConfigFile();
Writer writer = new FileWriter(configFile);
gson.toJson(this, writer);
writer.flush();
writer.close();
} catch (IOException e) {
//Ignore