dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: fix progress handling in gimp_apply_operation() 

Only end the progress if we also started it here.
This commit is contained in:
Michael Natterer 2012-10-12 20:09:47 +02:00
parent d6cf29e8c4
commit 0f0da94f55
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/core/gimp-apply-operation.c
View File

@ -45,6 +45,7 @@ gimp_apply_operation (GeglBuffer *src_buffer,
GeglProcessor *processor;
GeglRectangle rect = { 0, };
gdouble value;
gboolean progress_active = FALSE;
g_return_if_fail (GEGL_IS_BUFFER (src_buffer));
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
@ -80,7 +81,9 @@ gimp_apply_operation (GeglBuffer *src_buffer,
if (progress)
{
if (gimp_progress_is_active (progress))
progress_active = gimp_progress_is_active (progress);
if (progress_active)
{
if (undo_desc)
gimp_progress_set_text (progress, undo_desc);
@ -99,6 +102,6 @@ gimp_apply_operation (GeglBuffer *src_buffer,
g_object_unref (gegl);
if (progress)
if (progress && ! progress_active)
gimp_progress_end (progress);
}