From 59fe8feb5e01a21dc7565ca6dda0363946633908 Mon Sep 17 00:00:00 2001
From: Niels <nielsie95>
Date: Wed, 4 Aug 2010 14:08:03 +0200
Subject: [PATCH] Tried to fix the DTM Editor.

---
 Extensions/dtm_editor.sex | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/Extensions/dtm_editor.sex b/Extensions/dtm_editor.sex
index 306f8fe..3eb874e 100644
--- a/Extensions/dtm_editor.sex
+++ b/Extensions/dtm_editor.sex
@@ -7,7 +7,7 @@ var
 
 {$i mml.simba}
 const
-  Version = '0.5';
+  Version = '0.6';
   ZoomPixels = 3; //Should be an odd number (1, 3, 5, 7, ..)
 
 var
@@ -37,6 +37,15 @@ var
   MarkCol: Integer;
   PaintDTM, BufferChanged: Boolean;
 
+procedure FreeAndNil(var Bmp: TMufasaBitmap);
+begin
+  if (Bmp <> nil) then
+  begin
+    Bmp.Free;
+    Bmp := nil;
+  end;
+end;
+
 function GetLine(p1, p2: TPoint): TPointArray;
 var
   dx, dy: Extended;
@@ -321,13 +330,7 @@ end;
 
 procedure ResetBuffer;
 begin
-  {
-  Freeing the BmpBuffer here causes access violations.
-  It will have to investigated later.
-  if (bmpBuffer <> nil) then
-    bmpBuffer.Free;
-  }
-
+  FreeAndNil(bmpBuffer);
   bmpBuffer := bmp.Copy(0, 0, bmp.Width - 1, bmp.Height - 1);
   BufferChanged := False;
 end;
@@ -518,11 +521,7 @@ begin
   edTolerance.Text := '0';
   shColour.Brush.Color := clWhite;
 
-  if (bmpOverlay <> nil) then
-  begin
-    bmpOverlay.Free;
-    bmpOverlay := nil;
-  end;
+  FreeAndNil(bmpOverlay);
   ResetBuffer;
   UpdateBitmap(True, False);
   frm.ActiveControl := lb;
@@ -661,10 +660,7 @@ begin
   PaintDTM := True;
 
   if (bmpOverlay <> nil) then
-  begin
-    bmpOverlay.Free;
-    bmpOverlay := nil;
-  end
+    FreeAndNil(bmpOverlay)
   else
     ResetBuffer;
   UpdateBitmap(True, False);
@@ -1292,10 +1288,8 @@ begin
     CreateForm;
     Result := frm.ShowModal;
   finally
-    if (bmpOverlay <> nil) then
-      bmpOverlay.Free;
-    if (bmpBuffer <> nil) then
-      bmpBuffer.Free;
+    FreeAndNil(bmpOverlay);
+    FreeAndNil(bmpBuffer);
     bmp.Free;
     frm.Free;
   end;