diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 40a0b7e358..0c424704bf 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1169,19 +1169,15 @@ Session::butler_transport_work ()
 {
 	/* Note: this function executes in the butler thread context */
 
-restart:
-	bool finished;
-	PostTransportWork ptw;
+  restart:
 	boost::shared_ptr<RouteList> r = routes.reader ();
+	int on_entry = g_atomic_int_get (&_butler->should_do_transport_work);
+	bool finished = true;
+	PostTransportWork ptw = post_transport_work();
 	uint64_t before;
 
-	int on_entry = g_atomic_int_get (&_butler->should_do_transport_work);
-	finished = true;
-	ptw = post_transport_work();
-
 	DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler transport work, todo = %1 at %2\n", enum_2_string (ptw), (before = g_get_monotonic_time())));
 
-
 	if (ptw & PostTransportLocate) {
 
 		if (get_play_loop() && !Config->get_seamless_loop()) {