From acfff57ac80f20cba96b40acfc5cbf0aa344cbe2 Mon Sep 17 00:00:00 2001
From: SteveDaulton <stevedaulton@gmail.com>
Date: Mon, 9 Mar 2020 17:00:19 +0000
Subject: [PATCH] Bug 2347: Begin loop play from cursor if no selection

If no selection and cursor outside of project time range,
begin loop play at beginning of project.
---
 src/ProjectAudioManager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp
index 985453950..2e3edcf26 100644
--- a/src/ProjectAudioManager.cpp
+++ b/src/ProjectAudioManager.cpp
@@ -165,7 +165,7 @@ int ProjectAudioManager::PlayPlayRegion(const SelectedRegion &selectedRegion,
       if (looped) {
          const auto &selectedRegion = ViewInfo::Get( *p ).selectedRegion;
          // play selection if there is one, otherwise
-         // set start of play region to project start, 
+         // set start of play region to project start,
          // and loop the project from current play position.
 
          if ((t0 > selectedRegion.t0()) && (t0 < selectedRegion.t1())) {
@@ -175,7 +175,7 @@ int ProjectAudioManager::PlayPlayRegion(const SelectedRegion &selectedRegion,
          else {
             // loop the entire project
             // Bug2347, loop playback from cursor position instead of project start
-            loop_offset = t0;
+            loop_offset = t0 - tracks.GetStartTime();
             t0 = tracks.GetStartTime();
             t1 = tracks.GetEndTime();
          }
@@ -698,7 +698,7 @@ bool ProjectAudioManager::DoRecord(AudacityProject &project,
          // Bug 1548.  First of new tracks needs the focus.
          TrackFocus::Get(*p).Set(first);
       }
-      
+
       //Automated Input Level Adjustment Initialization
       #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
          gAudioIO->AILAInitialize();
@@ -747,7 +747,7 @@ void ProjectAudioManager::OnPause()
    // Bug 1494 - Pausing a seek or scrub should just STOP as
    // it is confusing to be in a paused scrub state.
    bool bStopInstead = paused &&
-      gAudioIO->IsScrubbing() && 
+      gAudioIO->IsScrubbing() &&
       !scrubber.IsSpeedPlaying() &&
       !scrubber.IsKeyboardScrubbing();
 
@@ -755,7 +755,7 @@ void ProjectAudioManager::OnPause()
       Stop();
       return;
    }
-   
+
    if (gAudioIO->IsScrubbing())
       scrubber.Pause(paused);
    else