fixed sky changing

diff --git a/src/editor/f_addresource_sky.pas b/src/editor/f_addresource_sky.pas
index c01815a23b2c37219354f41fc52c95c066378758..79362df8f84f194d09b5a83da44b128da106b1be 100644 (file)
--- a/src/editor/f_addresource_sky.pas
+++ b/src/editor/f_addresource_sky.pas
@@ -61,7 +61,10 @@ begin
 
   InitImage(img);
   if not LoadImageFromMemory(TextureData, ImageSize, img) then
+  begin
+    FreeMem(TextureData);
     Exit;
+  end;
 
   Width  := img.width;
   Height := img.height;

diff --git a/src/editor/f_mapoptions.lfm b/src/editor/f_mapoptions.lfm
index d1fa014601714c4fd726e4a822241172ab41a01c..28294a899eef0793e0da005f1b2df46436dfd889 100644 (file)
--- a/src/editor/f_mapoptions.lfm
+++ b/src/editor/f_mapoptions.lfm
@@ -12,7 +12,7 @@ object MapOptionsForm: TMapOptionsForm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  OnActivate = FormActivate
+  OnCreate = FormCreate
   Position = poScreenCenter
   ShowHint = True
   LCLVersion = '1.6.4.0'
@@ -640,7 +640,6 @@ object MapOptionsForm: TMapOptionsForm
     Top = 147
     Width = 278
     Color = clBtnFace
-    OnChange = eMapDescriptionChange
     ReadOnly = True
     TabStop = False
     TabOrder = 4
@@ -651,7 +650,6 @@ object MapOptionsForm: TMapOptionsForm
     Top = 187
     Width = 278
     Color = clBtnFace
-    OnChange = eMapDescriptionChange
     ReadOnly = True
     TabStop = False
     TabOrder = 7

diff --git a/src/editor/f_mapoptions.pas b/src/editor/f_mapoptions.pas
index d86ff0e3542b508c132588a588f188d4a0e0bfb9..a69c5cfbe434938855fc776c4c337f73bd4e52fb 100644 (file)
--- a/src/editor/f_mapoptions.pas
+++ b/src/editor/f_mapoptions.pas
@@ -77,7 +77,7 @@ type
     bOK: TButton;
     bCancel: TButton;
     
-    procedure FormActivate(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure bCancelClick(Sender: TObject);
     procedure bOKClick(Sender: TObject);
 
@@ -122,10 +122,8 @@ begin
   Result := True;
 end;
 
-// Form processing
-procedure TMapOptionsForm.FormActivate(Sender: TObject);
-var
-  a, b: Integer;
+procedure TMapOptionsForm.FormCreate(Sender: TObject);
+  var a, b: Integer;
 begin
   // General map options
   eMapName.Text := gMapInfo.Name;
@@ -174,7 +172,6 @@ begin
       if gTriggers[a].TriggerType <> 0 then
         b := b + 1;
   lTriggerCount.Caption := IntToStr(b);
-
 end;
 
 procedure TMapOptionsForm.bCancelClick(Sender: TObject);