From 3a70c6f5abfd02f511bf6ef195aeb67c12553288 Mon Sep 17 00:00:00 2001
From: metaprime <metaprime@users.noreply.github.com>
Date: Thu, 12 Oct 2017 02:13:22 -0700
Subject: [PATCH] Window positioning issue workaround needs to be applied to
 saving the window position.

---
 .../com/rarchives/ripme/ui/MainWindow.java    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java
index 8b54e180..ee9d8a9c 100644
--- a/src/main/java/com/rarchives/ripme/ui/MainWindow.java
+++ b/src/main/java/com/rarchives/ripme/ui/MainWindow.java
@@ -1301,15 +1301,30 @@ public final class MainWindow implements Runnable, RipStatusHandler {
         Utils.setConfigBoolean("window.position", false);
     }
 
+    public static boolean hasWindowPositionBug() {
+        String osName = System.getProperty("os.name");
+        if (osName != null) {
+            // Java on Windows has a bug where if we try to manually set the position of the Window,
+            // javaw.exe will not close itself down when the application is closed.
+            // Therefore, even if isWindowPositioningEnabled, if we are on Windows, we ignore it.
+            return osName.startsWith("Windows");
+        } else {
+            // If we're unsure, since we know there might be a bug,
+            // better be safe and report that the bug exists.
+            return true;
+        }
+    }
+
     public static boolean isWindowPositioningEnabled() {
         boolean isEnabled = Utils.getConfigBoolean("window.position", true);
-        return isEnabled;
+        return isEnabled && !hasWindowPositionBug();
     }
 
     public static void saveWindowPosition(Frame frame) {
         if (!isWindowPositioningEnabled()) {
             return;
         }
+
         Point point;
         try {
             point = frame.getLocationOnScreen();
@@ -1333,22 +1348,8 @@ public final class MainWindow implements Runnable, RipStatusHandler {
         logger.debug("Saved window position (x=" + x + ", y=" + y + ", w=" + w + ", h=" + h + ")");
     }
 
-    public static boolean hasWindowPositionBug() {
-        String osName = System.getProperty("os.name");
-        if (osName != null) {
-            // Java on Windows has a bug where if we try to manually set the position of the Window,
-            // javaw.exe will not close itself down when the application is closed.
-            // Therefore, even if isWindowPositioningEnabled, if we are on Windows, we ignore it.
-            return osName.startsWith("Windows");
-        } else {
-            // If we're unsure, since we know there might be a bug,
-            // better be safe and report that the bug exists.
-            return true;
-        }
-    }
-
     public static void restoreWindowPosition(Frame frame) {
-        if (!isWindowPositioningEnabled() || hasWindowPositionBug()) {
+        if (!isWindowPositioningEnabled()) {
             mainFrame.setLocationRelativeTo(null); // default to middle of screen
             return;
         }