1.0.1.6.1 hotfix release

Exslims · Aug 6, 2017 · 6e60cc7 · 6e60cc7
1 parent 090f771
commit 6e60cc7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java
@@ -1,7 +1,7 @@
 package com.mercury.platform.core;
 
 public class MercuryConstants {
-    public static final String APP_VERSION = "1.0.1.6";
+    public static final String APP_VERSION = "1.0.1.6.1";
     public static final String SERVER_HOST = "exslims.ddns.net";
     public static final int PORT = 5555;
 }
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/adr/AdrManager.java b/app-ui/src/main/java/com/mercury/platform/ui/adr/AdrManager.java
@@ -175,6 +175,8 @@ public void subscribe() {
                             .findAny().orElse(null);
             if(targetFrame != null) {
                 targetFrame.onDestroy();
+                targetFrame.disableSettings();
+                targetFrame.setVisible(false);
                 this.frames.remove(targetFrame);
                 this.selectedProfile.getContents().remove(descriptor);
                 targetFrame.dispose();

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AdrComponentsFactory.java b/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AdrComponentsFactory.java
@@ -126,18 +126,18 @@ public JButton getHotKeyButton(AdrComponentDescriptor descriptor) {
         button.setFont(this.componentsFactory.getFont(FontStyle.BOLD, 18f));
         MouseAdapter mouseAdapter = new MouseAdapter() {
             @Override
-            public void mouseClicked(MouseEvent e) {
+            public void mousePressed(MouseEvent e) {
                 if(SwingUtilities.isLeftMouseButton(e)) {
                     button.setBackground(AppThemeColor.SLIDE_BG);
                     button.setText("Press any key");
                     allowed = true;
+                    button.removeMouseListener(this);
                 }
             }
         };
         button.addMouseListener(mouseAdapter);
         MercuryStoreCore.hotKeySubject.subscribe(hotKey -> {
             if (allowed) {
-                button.removeMouseListener(mouseAdapter);
                 button.setBackground(AppThemeColor.BUTTON);
                 if (hotKey.getVirtualKeyCode() == 27) {
                     descriptor.setHotKeyDescriptor(new HotKeyDescriptor());

diff --git a/app-ui/src/main/resources/notes/patch/patch-notes.json b/app-ui/src/main/resources/notes/patch/patch-notes.json
@@ -1,9 +1,9 @@
 {
-  "version":"1.0.1.6",
+  "version":"1.0.1.6.1",
   "notes":[
     {
-      "title" : "Update",
-      "text" : "- New feature: Mercury: Overseer (check reddit).\n- New configuration system based on profiles.\n- Now Notification panel can be disabled\n- Mercury now works nicely regardless of the localization you use.\n- Added poeapp.com trade messages templates.\n- Many backend improvements.\n\nDetailed information you can find on reddit in related thread. Thank you for staying with us!",
+      "title" : "Hotfix",
+      "text" : "Overseer:\n- Fixed a bug with tracker not working properly with multiple simultanious key presses.\n- Fixed a bug with components not being removed properly.\n- Improved the icon selection dialog performance.\n- Now you can bind left/midle/right mouse buttons as a hotkey.\n\nThanks for your fast feedback and support. New features are coming soon!",
       "image" : "",
       "layout" : "VERTICAL"
     }