1 files changed, 6 insertions, 3 deletions
diff --git a/body/fltk-widgets.adb b/body/fltk-widgets.adb
index d446a93..acb87f0 100644
--- a/body/fltk-widgets.adb
+++ b/body/fltk-widgets.adb
@@ -637,10 +637,13 @@ package body FLTK.Widgets is
     procedure Extra_Final
            (This : in out Widget)
     is
-        Maybe_Parent : constant access FLTK.Widgets.Groups.Group'Class := This.Parent;
+        Maybe_Parent : access FLTK.Widgets.Groups.Group'Class;
     begin
-        if Maybe_Parent /= null then
-            Maybe_Parent.Remove (This);
+        if This.Needs_Dealloc then
+            Maybe_Parent := This.Parent;
+            if Maybe_Parent /= null then
+                Maybe_Parent.Remove (This);
+            end if;
         end if;
     end Extra_Final;