X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=35365444682489d81adf7b25ed864416d6c47abe;hp=c02abb387c0309ad79a8cba66d79733af22a775a;hb=HEAD;hpb=fcec1f3121e8c0acfe189124ebcf90415c1240e9

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index c02abb3..3536544 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -643,11 +643,25 @@ public class Main {
 				break;
 			case STOP_SERVER:
 				// Can be given via "--remote XX XX XX"
-				if (key == null)
-					key = Instance.getInstance().getConfig().getString(Config.SERVER_KEY);
-				if (port == null)
+				if (key == null) {
+					key = Instance.getInstance().getConfig()
+							.getString(Config.SERVER_KEY);
+					
+					// If a subkey in RW mode exists, use it
+					for (String subkey : Instance.getInstance().getConfig()
+							.getList(Config.SERVER_ALLOWED_SUBKEYS,
+									new ArrayList<String>())) {
+						if ((subkey + "|").contains("|rw|")) {
+							key = key + "|" + subkey;
+							break;
+						}
+					}
+				}
+				
+				if (port == null) {
 					port = Instance.getInstance().getConfig().getInteger(Config.SERVER_PORT);
-
+				}
+				
 				if (host == null) {
 					String mode = Instance.getInstance().getConfig()
 							.getString(Config.SERVER_MODE, "fanfix");