From f4aee7948f1fe20002df4cfce82878d3d070555e Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 27 Jun 2016 23:38:42 -0400 Subject: [PATCH] Bug1429: Fix Mac crash in 2nd Audacity process enabling VST plugins --- src/Track.cpp | 7 ++++--- src/Track.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Track.cpp b/src/Track.cpp index 3218c1448..a92f7402d 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -770,7 +770,7 @@ void TrackList::Swap(TrackList &that) TrackList::~TrackList() { - Clear(); + Clear(false); } void TrackList::RecalcPositions(TrackNodePointer node) @@ -956,10 +956,11 @@ TrackNodePointer TrackList::Remove(Track *t) return result; } -void TrackList::Clear() +void TrackList::Clear(bool sendEvent) { ListOfTracks::clear(); - UpdatedEvent(end()); + if (sendEvent) + UpdatedEvent(end()); } void TrackList::Select(Track * t, bool selected /* = true */ ) diff --git a/src/Track.h b/src/Track.h index 79c6e3e50..e4a3ba99c 100644 --- a/src/Track.h +++ b/src/Track.h @@ -448,7 +448,7 @@ class TrackList final : public wxEvtHandler, public ListOfTracks TrackNodePointer Remove(Track *t); /// Make the list empty - void Clear(); + void Clear(bool sendEvent = true); /** Select a track, and if it is linked to another track, select it, too. */ void Select(Track * t, bool selected = true);