From d731e4dba1109ba641cea132c004dad71cbc4268 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Thu, 28 Oct 2010 17:02:29 +0000
Subject: [PATCH] Fix up progress bar on normalization.

git-svn-id: svn://localhost/ardour2/branches/3.0@7934 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_ops.cc | 1 -
 libs/ardour/progress.cc   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 93cdbf2254..b03df00cec 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4839,7 +4839,6 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 
 			if (progress) {
 				progress->ascend ();
-				progress->set_progress (float (n + 1) / N);
 			}
 		}
 
diff --git a/libs/ardour/progress.cc b/libs/ardour/progress.cc
index 0679ce8a13..d09309f793 100644
--- a/libs/ardour/progress.cc
+++ b/libs/ardour/progress.cc
@@ -46,7 +46,9 @@ void
 ARDOUR::Progress::ascend ()
 {
 	assert (!_stack.empty ());
+	float const a = _stack.back().allocation;
 	_stack.pop_back ();
+	_stack.back().normalised += a;
 }
 
 /** Set the progress of the current task.