X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=9d31b354867326012c68a6b6bc0c2e19273adb4d;hb=51192932622563a4c658ae9f5d510c982d86374d;hp=42eeb459aba25c0160c071c836e23f85a8612ca0;hpb=35d92477b4e4b00c06562e4aac609764250bf8c3;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 42eeb45..9d31b35 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -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);