From afc351604b9a5f1f9dea1d6c5db80b31d7aff5a9 Mon Sep 17 00:00:00 2001
From: MaximZaitsev <AnterKan1@gmail.com>
Date: Thu, 14 Jul 2016 15:25:14 +0300
Subject: [PATCH] corrected errors

---
 car_net/stFlashServer/handlers.js            |  2 +-
 desktop_clients/CarCtl/src/main/java/Main.kt | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/car_net/stFlashServer/handlers.js b/car_net/stFlashServer/handlers.js
index ac54f090ddc..7f8507d1f44 100644
--- a/car_net/stFlashServer/handlers.js
+++ b/car_net/stFlashServer/handlers.js
@@ -11,7 +11,7 @@ function loadBin(httpContent, response) {
     var uploadClass = main.protoConstructorCarkot.Upload;
     var uploadObject = uploadClass.decode(httpContent);
     fs.writeFile(main.binFilePath, uploadObject.data.buffer, "binary", function (error) {
-        var uploadResultClass = main.protoConstructor.UploadResult;
+        var uploadResultClass = main.protoConstructorCarkot.UploadResult;
         var code = 0;
         var stdErr = "";
         if (error) {
diff --git a/desktop_clients/CarCtl/src/main/java/Main.kt b/desktop_clients/CarCtl/src/main/java/Main.kt
index 1e462ac7fe0..65bb6c24729 100644
--- a/desktop_clients/CarCtl/src/main/java/Main.kt
+++ b/desktop_clients/CarCtl/src/main/java/Main.kt
@@ -1,7 +1,6 @@
 import client.Client
 import com.martiansoftware.jsap.FlaggedOption
 import com.martiansoftware.jsap.JSAP
-import java.util.*
 
 /**
  * Created by user on 7/14/16.
@@ -17,7 +16,6 @@ fun main(args: Array<String>) {
         println(jsap.getHelp())
         return
     }
-
     val host = config.getString("host")
     val port = config.getInt("port")
     val direction = config.getChar("direction")
@@ -37,9 +35,12 @@ fun main(args: Array<String>) {
 fun initTextInterface(carControl: CarControl) {
     val helpMessage = "type f, b, l, r, s for command forward, backward, left, right, stop. to exit type q or quit ";
     println(helpMessage)
-    val scanner = Scanner(System.`in`)
-    while (scanner.hasNext()) {
-        val nextLine = scanner.nextLine()
+
+    while (true) {
+        val nextLine = readLine()
+        if (nextLine == null) {
+            return
+        }
         if (nextLine.equals("q", true) || nextLine.equals("quit", true)) {
             return
         } else if (nextLine.length != 1) {