1 files changed, 9 insertions, 6 deletions
diff --git a/src/fltk-widgets-groups-windows-opengl.adb b/src/fltk-widgets-groups-windows-opengl.adb
index 9ea1ed3..e315cc4 100644
--- a/src/fltk-widgets-groups-windows-opengl.adb
+++ b/src/fltk-widgets-groups-windows-opengl.adb
@@ -210,17 +210,20 @@ package body FLTK.Widgets.Groups.Windows.OpenGL is
 
 
 
+    procedure Extra_Final
+           (This : in out GL_Window) is
+    begin
+        Extra_Final (Window (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out GL_Window) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in GL_Window'Class
-        then
-            This.Clear;
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_gl_window (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Window (This));
     end Finalize;