GitHub-Mirror/G940LEDControl
1
0
Fork 0
mirror of synced 2024-11-22 10:03:51 +00:00
Code Issues Projects Releases Wiki Activity

Bugfixes pre 1.0 release

Browse Source
This commit is contained in:
Mark van Renswoude 2013-02-24 21:00:48 +00:00
parent 50580144ac
commit 72121a83ec
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
G940LEDControl/Forms/MainFrm.dfm
View File

@ -280,7 +280,7 @@ object MainForm: TMainForm
Top = 67 Top = 67
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P1' Caption = 'P&1'
TabOrder = 3 TabOrder = 3
end end
object btnP2: TButton object btnP2: TButton
@ -288,7 +288,7 @@ object MainForm: TMainForm
Top = 114 Top = 114
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P2' Caption = 'P&2'
TabOrder = 4 TabOrder = 4
end end
object btnP3: TButton object btnP3: TButton
@ -296,7 +296,7 @@ object MainForm: TMainForm
Top = 161 Top = 161
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P3' Caption = 'P&3'
TabOrder = 5 TabOrder = 5
end end
object btnP4: TButton object btnP4: TButton
@ -304,7 +304,7 @@ object MainForm: TMainForm
Top = 208 Top = 208
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P4' Caption = 'P&4'
TabOrder = 6 TabOrder = 6
end end
object btnP5: TButton object btnP5: TButton
@ -312,7 +312,7 @@ object MainForm: TMainForm
Top = 255 Top = 255
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P5' Caption = 'P&5'
TabOrder = 7 TabOrder = 7
end end
object btnP6: TButton object btnP6: TButton
@ -320,7 +320,7 @@ object MainForm: TMainForm
Top = 302 Top = 302
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P6' Caption = 'P&6'
TabOrder = 8 TabOrder = 8
end end
object btnP7: TButton object btnP7: TButton
@ -328,7 +328,7 @@ object MainForm: TMainForm
Top = 349 Top = 349
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P7' Caption = 'P&7'
TabOrder = 9 TabOrder = 9
end end
object btnP8: TButton object btnP8: TButton
@ -336,7 +336,7 @@ object MainForm: TMainForm
Top = 396 Top = 396
Width = 41 Width = 41
Height = 41 Height = 41
Caption = 'P8' Caption = 'P&8'
TabOrder = 10 TabOrder = 10
end end
object cmbProfiles: TComboBox object cmbProfiles: TComboBox

3
G940LEDControl/Forms/MainFrm.pas
View File

@ -851,6 +851,9 @@ begin
if InputQuery('Save profile as', 'Save this profile as:', name) then if InputQuery('Save profile as', 'Save this profile as:', name) then
begin begin
existingProfile := Profiles.Find(name); existingProfile := Profiles.Find(name);
if existingProfile = profile then
existingProfile := nil;
if Assigned(existingProfile) then if Assigned(existingProfile) then
begin begin
case MessageBox(Self.Handle, PChar(Format('A profile named "%s" exists, do you want to overwrite it?', [name])), case MessageBox(Self.Handle, PChar(Format('A profile named "%s" exists, do you want to overwrite it?', [name])),

2
G940LEDControl/G940LEDControl.dproj
View File

@ -8,7 +8,7 @@
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<ProjectVersion>13.4</ProjectVersion> <ProjectVersion>13.4</ProjectVersion>
<Base>True</Base> <Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config> <Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType> <AppType>Application</AppType>

6
G940LEDControl/Units/Profile.pas
View File

@ -261,7 +261,10 @@ begin
begin begin
FButtons.Add(button); FButtons.Add(button);
end else end else
begin
FButtons.Add(nil);
FreeAndNil(button); FreeAndNil(button);
end;
finally finally
AReader.EndSection; AReader.EndSection;
Inc(buttonIndex); Inc(buttonIndex);
@ -280,7 +283,8 @@ begin
begin begin
if AWriter.BeginSection(SectionButton + IntToStr(buttonIndex)) then if AWriter.BeginSection(SectionButton + IntToStr(buttonIndex)) then
try try
FButtons[buttonIndex].Save(AWriter); if Assigned(FButtons[buttonIndex]) then
FButtons[buttonIndex].Save(AWriter);
finally finally
AWriter.EndSection; AWriter.EndSection;
end; end;