paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-21 07:00:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

EditorOptions, prevent crash, if user-scheme is missing

Browse Source 
git-svn-id: trunk@25866 -
This commit is contained in:
martin 2010-06-03 15:49:11 +00:00
parent e2f0a958ac
commit aac881b08d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/editoroptions.pp
View File

@ -3789,6 +3789,8 @@ begin
'/ColorScheme/Value', '') '/ColorScheme/Value', '')
else else
Result := ''; Result := '';
if ColorSchemeFactory.ColorSchemeGroup[Result] = nil then
Result := '';
if Result = '' then if Result = '' then
Result := ReadPascalColorScheme; Result := ReadPascalColorScheme;
end; end;
@ -3805,6 +3807,8 @@ begin
TPreviewPasSyn.GetLanguageName) + '/ColorScheme/Value', '') TPreviewPasSyn.GetLanguageName) + '/ColorScheme/Value', '')
else else
Result := XMLConfig.GetValue('EditorOptions/Color/ColorScheme', ''); Result := XMLConfig.GetValue('EditorOptions/Color/ColorScheme', '');
if ColorSchemeFactory.ColorSchemeGroup[Result] = nil then
Result := '';
if (Result = '') then begin if (Result = '') then begin
if DefaultColorSchemeName <> '' then if DefaultColorSchemeName <> '' then
Result := DefaultColorSchemeName Result := DefaultColorSchemeName
@ -4040,6 +4044,8 @@ begin
// get current colorscheme: // get current colorscheme:
SynColorScheme := ReadColorScheme(aSynEd.Highlighter.LanguageName); SynColorScheme := ReadColorScheme(aSynEd.Highlighter.LanguageName);
SchemeGrp := UserColorSchemeGroup.ColorSchemeGroup[SynColorScheme]; SchemeGrp := UserColorSchemeGroup.ColorSchemeGroup[SynColorScheme];
if SchemeGrp = nil then
exit;
Scheme := SchemeGrp.ColorSchemeBySynClass[aSynEd.Highlighter.ClassType]; Scheme := SchemeGrp.ColorSchemeBySynClass[aSynEd.Highlighter.ClassType];
if Assigned(Scheme) then Scheme.ApplyTo(aSynEd); if Assigned(Scheme) then Scheme.ApplyTo(aSynEd);
@ -4056,6 +4062,8 @@ var
begin begin
SynColorScheme := ReadColorScheme(Syn.LanguageName); SynColorScheme := ReadColorScheme(Syn.LanguageName);
SchemeGrp := UserColorSchemeGroup.ColorSchemeGroup[SynColorScheme]; SchemeGrp := UserColorSchemeGroup.ColorSchemeGroup[SynColorScheme];
if SchemeGrp = nil then
exit;
Scheme := SchemeGrp.ColorSchemeBySynClass[Syn.ClassType]; Scheme := SchemeGrp.ColorSchemeBySynClass[Syn.ClassType];
Attrib := Scheme.AttributeByEnum[AddHilightAttr]; Attrib := Scheme.AttributeByEnum[AddHilightAttr];
if Attrib <> nil then begin if Attrib <> nil then begin