From c12d93b43589beaba7efdeeb92675edbb6f184ae Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Wed, 28 Nov 2018 18:00:09 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=B2=D0=B5=D1=80=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D1=81=D0=B8=D0=BD=D1=82=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D1=82=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B8=D1=8F=20=D0=B2=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=82=D0=BD=D0=BE=D0=BC=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/ru/gravit/launchserver/defaults/config.cfg  | 2 +-
 Launcher/runtime/engine/api.js                                 | 2 +-
 .../main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java    | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg
index 51f09b3c..4eb24654 100644
--- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg
+++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg
@@ -45,7 +45,7 @@ textureProviderConfig: {
 # Jar signing
 buildExtendedOperation: {
     enabled: false;
-    script: "java -jar myTransformer.jar %launcher-obf% %launcher-output% %launcher-nonObf%"; // The script to run
+    script: "java -jar myTransformer.jar %launcher-obf% %launcher-output% %launcher-nonObf%";
 };
 
 # Binaries name
diff --git a/Launcher/runtime/engine/api.js b/Launcher/runtime/engine/api.js
index 785f8f96..fb4ded98 100644
--- a/Launcher/runtime/engine/api.js
+++ b/Launcher/runtime/engine/api.js
@@ -101,7 +101,7 @@ function newTask(r) {
 }
 
 function newRequestTask(request) {
-    FunctionalBridge.makeRequest(request);
+    return newTask(function() request.request());
 }
 
 function startTask(task) {
diff --git a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
index 24374f1b..626648ee 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
@@ -40,6 +40,9 @@ public HWID getHWID() {
         hwid.serialNumber = getSerial();
         hwid.totalMemory = getTotalMemory();
         hwid.HWDiskSerial = getHWDisk();
+        LogHelper.debug("serialNumber %s",hwid.serialNumber);
+        LogHelper.debug("totalMemory %d",hwid.totalMemory);
+        LogHelper.debug("HWDiskSerial %s",hwid.HWDiskSerial);
         return hwid;
     }
 }