patch 8.2.0022: click in popup window doesn't close it in the GUIv8.2.0022

Problem:    Click in popup window doesn't close it in the GUI. (Sergey Vlasov)
Solution:   When processing the selection also send a button release event.
            (closes #5367)

2 files changed, 7 insertions, 1 deletions

diff --git a/src/gui.c b/src/gui.c
index 0a7f346db..8fd311474 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -3108,7 +3108,11 @@ button_set:
     if (clip_star.state == SELECT_IN_PROGRESS)
     {
 	clip_process_selection(button, X_2_COL(x), Y_2_ROW(y), repeated_click);
-	return;
+
+	// A release event may still need to be sent if the position is equal.
+	row = gui_xy2colrow(x, y, &col);
+	if (button != MOUSE_RELEASE || row != prev_row || col != prev_col)
+	    return;
     }
 
     // Determine which mouse settings to look for based on the current mode
diff --git a/src/version.c b/src/version.c
index 69341e0e5..286770288 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    22,
+/**/
     21,
 /**/
     20,