mirror of
				https://github.com/cookiengineer/audacity
				synced 2025-11-03 23:53:55 +01:00 
			
		
		
		
	Fix status bar messages and disabling of pause button for scrubbing.
This commit is contained in:
		@@ -208,6 +208,12 @@ void Scrubber::MarkScrubStart(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
   ControlToolBar * const ctb = mProject->GetControlToolBar();
 | 
					   ControlToolBar * const ctb = mProject->GetControlToolBar();
 | 
				
			||||||
   ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub);
 | 
					   ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub);
 | 
				
			||||||
 | 
					   if(gAudioIO->IsPaused())
 | 
				
			||||||
 | 
					      ctb->Pause(); // un-pause
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   // This disables the pause button.
 | 
				
			||||||
 | 
					   ctb->EnableDisableButtons();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   ctb->UpdateStatusBar(mProject);
 | 
					   ctb->UpdateStatusBar(mProject);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   CheckMenuItem();
 | 
					   CheckMenuItem();
 | 
				
			||||||
@@ -245,8 +251,11 @@ bool Scrubber::MaybeStartScrubbing(wxCoord xx)
 | 
				
			|||||||
         );
 | 
					         );
 | 
				
			||||||
         if (time1 != time0)
 | 
					         if (time1 != time0)
 | 
				
			||||||
         {
 | 
					         {
 | 
				
			||||||
            if (busy)
 | 
					            if (busy) {
 | 
				
			||||||
 | 
					               auto position = mScrubStartPosition;
 | 
				
			||||||
               ctb->StopPlaying();
 | 
					               ctb->StopPlaying();
 | 
				
			||||||
 | 
					               mScrubStartPosition = position;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            AudioIOStartStreamOptions options(mProject->GetDefaultPlayOptions());
 | 
					            AudioIOStartStreamOptions options(mProject->GetDefaultPlayOptions());
 | 
				
			||||||
            options.timeTrack = NULL;
 | 
					            options.timeTrack = NULL;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user