Merge branch 'master' of ssh://villavu.com:54367/simba

This commit is contained in:
Cazax 2010-07-23 23:32:55 -04:00
commit 13381cd9ac
4 changed files with 9 additions and 5 deletions

View File

@ -321,8 +321,12 @@ end;
procedure ResetBuffer;
begin
{
Freeing the BmpBuffer here causes access violations.
It will have to investigated later.
if (bmpBuffer <> nil) then
bmpBuffer.Free;
}
bmpBuffer := bmp.Copy(0, 0, bmp.Width - 1, bmp.Height - 1);
BufferChanged := False;

View File

@ -213,8 +213,8 @@ procedure Free;
begin
if (started) then
Timer.Enabled := False;//Freeing the components is not needed, as they will be freed upon the freeing of Simba.
if F <> nil then
F.Free;
{ if F <> nil then
F.Free; }
end;
procedure Attach;

View File

@ -1395,7 +1395,7 @@ end;
procedure Free;
begin
// Only here so people won't freak out. :)
Icon_Lock.Free;
{ Icon_Lock.Free; }
end;
{$IFDEF EXTENSION}

View File

@ -267,8 +267,8 @@ procedure Free;
begin
if (started) then
Timer.Enabled := False;//Freeing the components is not needed, as they will be freed upon the freeing of Simba.
if F <> nil then
F.Free;
{ if F <> nil then
F.Free; }
end;
procedure Attach;