dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pdb: Set choice args to default in gimp-file-save

Browse source 
In gimp_file_save (), we clear out the values
of any String parameters to prevent unexpected
results. However, GimpChoice is also a
String type. This causes the function to
fail because empty string is not a valid
option for GimpChoice.

This patch adds a prior check if the argument
is a GimpChoice, and sets it to its default
value instead to prevent this issue.
This commit is contained in:
Alx Sa 2024-11-12 13:46:38 +00:00
parent 21d834ec9b
commit 8021b46414
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/pdb/file-cmds.c
View file

@ -267,8 +267,17 @@ file_save_invoker (GimpProcedure *procedure,
}
for (i = custom_args_start; i < proc->num_args; i++)
if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
g_value_set_static_string (gimp_value_array_index (new_args, i), "");
if (GIMP_IS_PARAM_SPEC_CHOICE (proc->args[i]))
{
GParamSpecString *string_spec = G_PARAM_SPEC_STRING (proc->args[i]);
g_value_set_static_string (gimp_value_array_index (new_args, i),
string_spec->default_value);
}
else if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
{
g_value_set_static_string (gimp_value_array_index (new_args, i), "");
}
return_vals =
gimp_pdb_execute_procedure_by_name_args (gimp->pdb,

13
pdb/groups/file.pdb
View file

@ -287,8 +287,17 @@ HELP
}
for (i = custom_args_start; i < proc->num_args; i++)
if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
g_value_set_static_string (gimp_value_array_index (new_args, i), "");
if (GIMP_IS_PARAM_SPEC_CHOICE (proc->args[i]))
{
GParamSpecString *string_spec = G_PARAM_SPEC_STRING (proc->args[i]);
g_value_set_static_string (gimp_value_array_index (new_args, i),
string_spec->default_value);
}
else if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
{
g_value_set_static_string (gimp_value_array_index (new_args, i), "");
}
return_vals =
gimp_pdb_execute_procedure_by_name_args (gimp->pdb,