1 files changed, 4 insertions, 8 deletions
diff --git a/src/fltk-devices-surfaces.adb b/src/fltk-devices-surfaces.adb
index 0824a00..cee6910 100644
--- a/src/fltk-devices-surfaces.adb
+++ b/src/fltk-devices-surfaces.adb
@@ -37,15 +37,9 @@ package body FLTK.Devices.Surfaces is
     procedure Finalize
            (This : in out Surface_Device) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Surface_Device'Class
-        then
-            if This.Needs_Dealloc then
-                free_fl_surface (This.Void_Ptr);
-            end if;
-            This.Void_Ptr := Null_Pointer;
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
+            free_fl_surface (This.Void_Ptr);
         end if;
-        Finalize (Device (This));
     end Finalize;
 
 
@@ -62,6 +56,8 @@ package body FLTK.Devices.Surfaces is
             end return;
         end Create;
 
+        pragma Inline (Create);
+
     end Forge;