From 9bad1e3f3f98d09490cd67f41615e654e773f438 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 4 Jan 2019 20:37:34 +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=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=B7=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runtime/dialog/overlay/settings/settings.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Launcher/runtime/dialog/overlay/settings/settings.js b/Launcher/runtime/dialog/overlay/settings/settings.js index bb0b6029..1ccb5574 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.js +++ b/Launcher/runtime/dialog/overlay/settings/settings.js @@ -71,9 +71,6 @@ var settingsOverlay = { var newDir = chooser.showDialog(stage); if (newDir !== null) { settingsOverlay.transferCatalogDialog(newDir.toPath()); - settings.updatesDir = newDir.toPath(); - DirBridge.dirUpdates = settings.updatesDir; - settingsOverlay.updateDirLabel(); } }); @@ -140,10 +137,19 @@ var settingsOverlay = { transferCatalogDialog: function(newDir) { settingsOverlay.transferDialog.setVisible(true); - settingsOverlay.transferDialog.lookup("#cancelTransfer").setOnAction(function(event) settingsOverlay.transferDialog.setVisible(false)); + settingsOverlay.transferDialog.lookup("#cancelTransfer").setOnAction(function(event) + { + settings.updatesDir = newDir; + DirBridge.dirUpdates = settings.updatesDir; + settingsOverlay.updateDirLabel(); + settingsOverlay.transferDialog.setVisible(false)); + } settingsOverlay.transferDialog.lookup("#applyTransfer").setOnAction(function(event) { //Здесь могла быть ваша реклама, либо DirBridge.move(); DirBridge.move(newDir); + settings.updatesDir = newDir; + DirBridge.dirUpdates = settings.updatesDir; + settingsOverlay.updateDirLabel(); settingsOverlay.transferDialog.setVisible(false); }); },