mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: GioGetIconTheme crash if scheme does not exists

Browse source
This commit is contained in:
Alexander Koblov 2014-11-23 11:06:01 +00:00
commit d930ebe503
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/platform/unix/ugio.pas
View file

@ -78,17 +78,29 @@ function GioGetIconTheme(const Scheme: UTF8String): UTF8String;
var
Theme: Pgchar;
Settings: PGSettings;
SettingsSchema: PGSettingsSchema;
SchemaSource: PGSettingsSchemaSource;
begin
Settings:= g_settings_new(Pgchar(Scheme));
if Assigned(Settings) then
SchemaSource:= g_settings_schema_source_get_default();
if Assigned(SchemaSource) then
begin
Theme:= g_settings_get_string(Settings, 'icon-theme');
if Assigned(Theme) then
SettingsSchema:= g_settings_schema_source_lookup(SchemaSource, Pgchar(Scheme), False);
if Assigned(SettingsSchema) then
begin
Result:= StrPas(Theme);
g_free(Theme);
Settings:= g_settings_new(Pgchar(Scheme));
if Assigned(Settings) then
begin
Theme:= g_settings_get_string(Settings, 'icon-theme');
if Assigned(Theme) then
begin
Result:= StrPas(Theme);
g_free(Theme);
end;
g_object_unref(Settings);
end;
g_object_unref(PGObject(SettingsSchema));
end;
g_object_unref(Settings);
g_object_unref(PGObject(SchemaSource));
end;
end;
@ -151,6 +163,8 @@ begin
Assert(@g_app_info_get_id <> nil, 'g_app_info_get_id');
Assert(@g_settings_new <> nil, 'g_settings_new');
Assert(@g_settings_get_string <> nil, 'g_settings_get_string');
Assert(@g_settings_schema_source_get_default <> nil, 'g_settings_schema_source_get_default');
Assert(@g_settings_schema_source_lookup <> nil, 'g_settings_schema_source_lookup');
except
on E: Exception do
begin