X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=9d31b354867326012c68a6b6bc0c2e19273adb4d;hb=4a35ef70d67114d1f6a1b041f18087127e096c33;hp=e31bbf5bdbc94fe6cc0238b6312970f606c95c7f;hpb=7017646bf42cb265b6df539bb6def40b91d2f968;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index e31bbf5..9d31b35 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -104,7 +104,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 8, 7);
+	public static final Version VERSION = new Version(0, 8, 9);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -195,7 +195,13 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			}
 		}
 
-		final Configuration startConfiguration = oldConfiguration;
+		final Configuration startConfiguration;
+		if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+			logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+			startConfiguration = newConfiguration;
+		} else {
+			startConfiguration = oldConfiguration;
+		}
 		final EventBus eventBus = new EventBus();
 
 		/* Freenet injector configuration. */
@@ -264,10 +270,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* start core! */
 			core.start();
-			if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
-				logger.log(Level.INFO, "Setting configuration to file-based configuration.");
-				core.setConfiguration(newConfiguration);
-			}
 			webInterface.start();
 			webInterface.setFirstStart(firstStart);
 			webInterface.setNewConfig(newConfig);