From f71dbb2647478f587256c1f6b752eb6d1082ce81 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sat, 12 Jul 2025 16:28:49 +0200
Subject: [PATCH] Linux: ensure that old LinuxPopupMenuCanceler window listener
 is removed before adding a new one (issue #962)

(did not yet happen...)
---
 .../main/java/com/formdev/flatlaf/LinuxPopupMenuCanceler.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxPopupMenuCanceler.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxPopupMenuCanceler.java
index 0c097781..ac0565eb 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxPopupMenuCanceler.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxPopupMenuCanceler.java
@@ -70,6 +70,8 @@ class LinuxPopupMenuCanceler
 	}
 
 	private void addWindowListeners( MenuElement selected ) {
+		removeWindowListeners();
+
 		// see BasicPopupMenuUI.MouseGrabber.grabWindow()
 		Component invoker = selected.getComponent();
 		if( invoker instanceof JPopupMenu )