fix various loop-initiation faults

3 files changed, 7 insertions, 7 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index d0d3f96c67..0cf6682aec 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -4532,9 +4532,9 @@ ARDOUR_UI::transport_numpad_event (int num)
 			case 1:  transport_rewind(1); 				break;
 			case 2:  transport_forward(1); 				break;
 			case 3:  transport_record(true); 			break;
-			case 4:  if (_session) _session->request_play_loop(true);					break;
-			case 5:  if (_session) _session->request_play_loop(true); transport_record(false); 	break;
-			case 6:  toggle_punch(); 						break;
+			case 4:  toggle_session_auto_loop();		break;
+			case 5:  transport_record(false); toggle_session_auto_loop(); 	break;
+			case 6:  toggle_punch(); 					break;
 			case 7:  toggle_click(); 				break;
 			case 8:  toggle_auto_return();			break;
 			case 9:  toggle_follow_edits();		break;
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 4f6f1b91ce..caeddb06eb 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1240,8 +1240,8 @@ Editor::marker_menu_loop_range ()
 			l2->set (l->start(), l->end());
 
 			// enable looping, reposition and start rolling
-			_session->request_play_loop(true);
 			_session->request_locate (l2->start(), true);
+			_session->request_play_loop(true);
 		}
 	}
 }
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 3c47027dca..86dab143e9 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2370,8 +2370,8 @@ Editor::loop_location (Location& location)
 		tll->set (location.start(), location.end());
 
 		// enable looping, reposition and start rolling
-		_session->request_play_loop (true);
 		_session->request_locate (tll->start(), true);
+		_session->request_play_loop (true);
 	}
 }
 
@@ -5747,8 +5747,8 @@ Editor::set_loop_from_edit_range (bool play)
 	set_loop_range (start, end,  _("set loop range from edit range"));
 
 	if (play) {
-		_session->request_play_loop (true);
 		_session->request_locate (start, true);
+		_session->request_play_loop (true);
 	}
 }
 
@@ -5776,8 +5776,8 @@ Editor::set_loop_from_region (bool play)
 	set_loop_range (start, end, _("set loop range from region"));
 
 	if (play) {
-		_session->request_play_loop (true);
 		_session->request_locate (start, true);
+		_session->request_play_loop (true);
 	}
 }