X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=6f77e443bebdab359bbf2589f2e89cb35c925f4d;hb=0013f760d69fd7db2b298c3da5d89bc0b102eabf;hp=3d69cad31358f794d874b0645a9e124e36bf7caa;hpb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 3d69cad..6f77e44 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -10,7 +10,9 @@ import java.util.List;
 import javax.net.ssl.SSLException;
 
 import be.nikiroo.fanfix.bundles.Config;
+import be.nikiroo.fanfix.bundles.ConfigBundle;
 import be.nikiroo.fanfix.bundles.StringId;
+import be.nikiroo.fanfix.bundles.StringIdBundle;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
@@ -29,6 +31,8 @@ import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
+import be.nikiroo.utils.resources.Bundles;
+import be.nikiroo.utils.resources.TransBundle;
 import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
@@ -593,10 +597,14 @@ public class Main {
 				}
 				return;
 			case STOP_SERVER:
-				key = Instance.getConfig().getString(Config.SERVER_KEY);
-				port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+				// Can be given via "--remote XX XX XX"
+				if (key == null)
+					key = Instance.getConfig().getString(Config.SERVER_KEY);
+				if (port == null)
+					port = Instance.getConfig().getInteger(Config.SERVER_PORT);
+
 				if (port == null) {
-					System.err.println("No port configured in the config file");
+					System.err.println("No port given nor configured in the config file");
 					exitCode = 15;
 					break;
 				}
@@ -784,7 +792,7 @@ public class Main {
 		try {
 			URL source = BasicReader.getUrl(urlString);
 			sourceName = source.toString();
-			if (source.toString().startsWith("file://")) {
+			if (sourceName.startsWith("file://")) {
 				sourceName = sourceName.substring("file://".length());
 			}