Fixed hiding capture rect and main window timing issue on capturing s…

…ingle image
mvmn · Oct 9, 2020 · dd65520 · dd65520
1 parent d965c67
commit dd65520
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/src/main/java/x/mvmn/jscrcap/gui/swing/ControlWindow.java b/src/main/java/x/mvmn/jscrcap/gui/swing/ControlWindow.java
@@ -453,27 +453,17 @@ public void windowDeactivated(WindowEvent e) {}
 
 	private void doCapture(Rectangle captureRect) {
 		boolean captureRectWasVisible = captureRectFrame.isVisible();
-		captureRectFrame.setSize(0, 0);
 		this.setVisible(false);
 		if (captureRectWasVisible) {
 			captureRectFrame.setVisible(false);
-			try {
-				// TODO: Dirty workaround for OS X - investigate
-				// alternatives
-				Thread.sleep(50);
-			} catch (InterruptedException e) {}
 		}
-		BufferedImage screenshot = SwingUtil.getRobot().createScreenCapture(captureRect);
-		capturesTableModel.addImage(new CapturedImage(screenshot));
-		captureRectFrame.setSize(captureRect.width, captureRect.height);
-		if (captureRectWasVisible) {
-			try {
-				// TODO: Dirty workaround for OS X - investigate
-				// alternatives
-				Thread.sleep(15);
-			} catch (InterruptedException e) {}
-			captureRectFrame.setVisible(true);
-		}
-		this.setVisible(true);
+		SwingUtilities.invokeLater(() -> {
+			BufferedImage screenshot = SwingUtil.getRobot().createScreenCapture(captureRect);
+			capturesTableModel.addImage(new CapturedImage(screenshot));
+			if (captureRectWasVisible) {
+				captureRectFrame.setVisible(true);
+			}
+			this.setVisible(true);
+		});
 	}
 }