diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index 008002efd..984cdbbe7 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -2274,7 +2274,7 @@ void LabelTrack::Unselect() mSelIndex = -1; } -bool LabelTrack::IsSelected() const +bool LabelTrack::HasSelection() const { return (mSelIndex >= 0 && mSelIndex < (int)mLabels.size()); } diff --git a/src/LabelTrack.h b/src/LabelTrack.h index f3050c798..6d337c5e0 100644 --- a/src/LabelTrack.h +++ b/src/LabelTrack.h @@ -229,7 +229,8 @@ class AUDACITY_DLL_API LabelTrack final : public Track void Unselect(); - bool IsSelected() const; + // Whether any label box is selected -- not, whether the track is selected. + bool HasSelection() const; int GetNumLabels() const; const LabelStruct *GetLabel(int index) const; diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp index 9934bca17..484f45cb8 100644 --- a/src/menus/EditMenus.cpp +++ b/src/menus/EditMenus.cpp @@ -38,7 +38,7 @@ bool DoPasteText(AudacityProject &project) for (auto pLabelTrack : tracks->Any()) { // Does this track have an active label? - if (pLabelTrack->IsSelected()) { + if (pLabelTrack->HasSelection()) { // Yes, so try pasting into it if (pLabelTrack->PasteSelectedText(selectedRegion.t0(), diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp index 9f13bcede..7eef7432d 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp @@ -82,7 +82,7 @@ UIHandle::Result LabelTextHandle::Click mSelectedRegion = viewInfo.selectedRegion; pLT->HandleTextClick( event, evt.rect, viewInfo, &viewInfo.selectedRegion ); - wxASSERT(pLT->IsSelected()); + wxASSERT(pLT->HasSelection()); { // IF the user clicked a label, THEN select all other tracks by Label