From 2341cdeb6fe664fe74657d47c570bc091804131c Mon Sep 17 00:00:00 2001
From: asie
Date: Sat, 15 Jun 2019 08:54:48 +0200
Subject: fix unwanted declaration navigation during Quick Find

---
 src/main/java/cuchaz/enigma/gui/Gui.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui/Gui.java')

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index a61f4dd..dceeaa4 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -528,14 +528,14 @@ public class Gui {
 		return combo;
 	}
 
-	public void onCaretMove(int pos) {
+	public void onCaretMove(int pos, boolean fromClick) {
 		Token token = this.controller.getToken(pos);
 		boolean isToken = token != null;
 
 		cursorReference = this.controller.getReference(token);
 		Entry<?> referenceEntry = cursorReference != null ? cursorReference.entry : null;
 
-		if (referenceEntry != null && shouldNavigateOnClick) {
+		if (referenceEntry != null && shouldNavigateOnClick && fromClick) {
 			shouldNavigateOnClick = false;
 			Entry<?> navigationEntry = referenceEntry;
 			if (cursorReference.context == null) {
@@ -768,8 +768,9 @@ public class Gui {
 				if (response == JOptionPane.YES_OPTION) {
 					this.saveMapping();
 					this.frame.dispose();
-				} else if (response == JOptionPane.NO_OPTION)
+				} else if (response == JOptionPane.NO_OPTION) {
 					this.frame.dispose();
+				}
 
 				return null;
 			}, "Save and exit", "Discard changes", "Cancel");
-- 
cgit v1.2.3