From 7c1ccfa03875e47e178f0852e8e9ae05bcc554a2 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Fri, 7 Dec 2018 17:50:28 +0100
Subject: Complete fix for STR #3503 (Fl_Choice).

Fl_Choice::handle() needs to be fixed as well.
---
 src/Fl_Choice.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx
index 4bf4e7dd3..d12f473e3 100644
--- a/src/Fl_Choice.cxx
+++ b/src/Fl_Choice.cxx
@@ -173,6 +173,7 @@ int Fl_Choice::value(int v) {
 int Fl_Choice::handle(int e) {
   if (!menu() || !menu()->text) return 0;
   const Fl_Menu_Item* v;
+  Fl_Widget_Tracker wp(this);
   switch (e) {
   case FL_ENTER:
   case FL_LEAVE:
@@ -187,12 +188,14 @@ int Fl_Choice::handle(int e) {
     if (Fl::scheme()
 	|| fl_contrast(textcolor(), FL_BACKGROUND2_COLOR) != textcolor()) {
       v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
+      if (wp.deleted()) return 1;
     } else {
       // In order to preserve the old look-n-feel of "white" menus,
       // temporarily override the color() of this widget...
       Fl_Color c = color();
       color(FL_BACKGROUND2_COLOR);
       v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
+      if (wp.deleted()) return 1;
       color(c);
     }
     if (!v || v->submenu()) return 1;
-- 
cgit v1.2.3