X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectAction.java;h=dfdb53ed017da95df65d80f5b8111fc5e0fdc153;hb=217a3310efed6da8b1765738e6386825b3002570;hp=8f57c628fb18e861c9805174468f5ccb0ce0fba1;hpb=452f38c8b9e98215f4ed6def6f3f8fd5dfa75daa;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java
index 8f57c62..dfdb53e 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectAction.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectAction.java
@@ -108,6 +108,20 @@ abstract class ConnectAction {
 				out = new OutputStreamWriter(s.getOutputStream(), "UTF-8");
 				try {
 					if (server) {
+						String line = in.readLine();
+						if (line != null && line.startsWith("VERSION ")) {
+							// "VERSION client-version" (VERSION 1.0.0)
+							Version clientVersion = new Version(
+									line.substring("VERSION ".length()));
+							this.clientVersion = clientVersion;
+							Version v = negotiateVersion(clientVersion);
+							if (v == null) {
+								v = new Version();
+							}
+
+							sendString("VERSION " + v.toString());
+						}
+
 						action(clientVersion);
 					} else {
 						String v = sendString("VERSION " + version.toString());
@@ -253,22 +267,7 @@ abstract class ConnectAction {
 					contentToSend = false;
 				}
 
-				String line = in.readLine();
-				if (server && line != null && line.startsWith("VERSION ")) {
-					// "VERSION client-version" (VERSION 1.0.0)
-					Version clientVersion = new Version(
-							line.substring("VERSION ".length()));
-					this.clientVersion = clientVersion;
-					Version v = negotiateVersion(clientVersion);
-					if (v == null) {
-						v = new Version();
-					}
-					sendString("VERSION " + v.toString());
-
-					line = in.readLine();
-				}
-
-				return line;
+				return in.readLine();
 			}
 
 			return null;