Set return_val before destroying values[] as it may still be needed.

2006-11-18  Kevin Cozens  <kcozens@cvs.gnome.org>

	* plug-ins/script-fu/scheme-wrapper.c (marshall_proc_db_call): Set
	return_val before destroying values[] as it may still be needed.
This commit is contained in:
Kevin Cozens 2006-11-18 22:30:23 +00:00 committed by Kevin Cozens
parent cb690334cd
commit f50adb011a
2 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2006-11-18 Kevin Cozens <kcozens@cvs.gnome.org>
* plug-ins/script-fu/scheme-wrapper.c (marshall_proc_db_call): Set
return_val before destroying values[] as it may still be needed.
2006-11-18 Michael Natterer <mitch@gimp.org>
* etc/gtkrc: remove example about adding a help keybinding

View File

@ -1524,6 +1524,16 @@ fprintf (stderr, " data '%.*s'\n",
break;
}
/* If we have no return value(s) from PDB call, return */
/* either TRUE or FALSE to indicate if call succeeded. */
if (return_val == sc->NIL)
{
if (values[0].data.d_status == GIMP_PDB_SUCCESS)
return_val = sc->vptr->cons (sc, sc->T, sc->NIL);
else
return_val = sc->vptr->cons (sc, sc->F, sc->NIL);
}
/* free the proc name */
g_free (proc_name);
@ -1552,16 +1562,6 @@ fprintf (stderr, " data '%.*s'\n",
gtk_main_iteration ();
#endif
/* If we have no return value(s) from PDB call, return */
/* either TRUE or FALSE to indicate if call succeeded. */
if (return_val == sc->NIL)
{
if (values[0].data.d_status == GIMP_PDB_SUCCESS)
return_val = sc->vptr->cons (sc, sc->T, sc->NIL);
else
return_val = sc->vptr->cons (sc, sc->F, sc->NIL);
}
return return_val;
}