Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-22 08:31:14 +01:00
Code Issues Releases Wiki Activity

weak_ptr not events to avoid dangling track pointers in UIHandles

Browse Source
This commit is contained in:
Paul Licameli
2017-06-24 17:04:07 -04:00
parent 321919301e
commit fa5a742e22
16 changed files with 182 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tracks/ui/TrackButtonHandles.cpp
View File

@@ -37,11 +37,12 @@ UIHandle::Result MinimizeButtonHandle::CommitChanges
{
using namespace RefreshCode;
if (mpTrack)
auto pTrack = mpTrack.lock();
if (pTrack)
{
mpTrack->SetMinimized(!mpTrack->GetMinimized());
if (mpTrack->GetLink())
mpTrack->GetLink()->SetMinimized(mpTrack->GetMinimized());
pTrack->SetMinimized(!pTrack->GetMinimized());
if (pTrack->GetLink())
pTrack->GetLink()->SetMinimized(pTrack->GetMinimized());
pProject->ModifyState(true);
// Redraw all tracks when any one of them expands or contracts
@@ -93,12 +94,13 @@ UIHandle::Result CloseButtonHandle::CommitChanges
using namespace RefreshCode;
Result result = RefreshNone;
if (mpTrack)
auto pTrack = mpTrack.lock();
if (pTrack)
{
pProject->StopIfPaused();
if (!pProject->IsAudioActive()) {
// This pushes an undo item:
pProject->RemoveTrack(mpTrack);
pProject->RemoveTrack(pTrack.get());
// Redraw all tracks when any one of them closes
// (Could we invent a return code that draws only those at or below
// the affected track?)