From d50d2e22b87727429e1ff2d8a41851004455fc9b Mon Sep 17 00:00:00 2001
From: zaxar163 <zahar.vcherachny@yandex.ru>
Date: Sat, 27 Apr 2019 18:46:15 +0300
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=95=D1=89=D1=91=20=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=81=D1=8B=20=D1=82=D0=B0=D0=BA=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE?=
 =?UTF-8?q?=20=D1=81=20RAM.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Launcher/runtime/dialog/overlay/settings/settings.js            | 2 +-
 .../src/main/java/ru/gravit/launcher/client/ClientLauncher.java | 2 +-
 .../src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Launcher/runtime/dialog/overlay/settings/settings.js b/Launcher/runtime/dialog/overlay/settings/settings.js
index 3e2fd32d..590dea8b 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.js
+++ b/Launcher/runtime/dialog/overlay/settings/settings.js
@@ -42,7 +42,7 @@ var settingsOverlay = {
         settingsOverlay.updateRAMLabel();
 
         var ramSlider = holder.lookup("#ramSlider");
-        ramSlider.setMax(FunctionalBridge.getTotalMemory());
+        ramSlider.setMax(FunctionalBridge.getJVMTotalMemory());
         ramSlider.setSnapToTicks(true);
         ramSlider.setShowTickMarks(true);
         ramSlider.setShowTickLabels(true);
diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
index 77fd11e9..3d8d118a 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
@@ -327,7 +327,7 @@ public static Process launch(
         context.playerProfile = params.pp;
         context.args.add(javaBin.toString());
         context.args.add(MAGICAL_INTEL_OPTION);
-        if (params.ram > 0 && params.ram <= FunctionalBridge.getTotalMemory()) {
+        if (params.ram > 0 && params.ram <= FunctionalBridge.getJVMTotalMemory()) {
             context.args.add("-Xms" + params.ram + 'M');
             context.args.add("-Xmx" + params.ram + 'M');
         }
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 69f68802..5e75d632 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
@@ -83,7 +83,7 @@ public String getMacAddr() {
     }
 
     public long getTotalMemory() {
-        if (noHWID) return 1024>>20;
+        if (noHWID) return 1024<<20;
         if (hardware == null) hardware = systemInfo.getHardware();
         return hardware.getMemory().getTotal();
     }