From 0ebc23e3a9ff08f6659b4fdbdbde1da97c291736 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Fri, 8 Apr 2016 21:50:15 -0400
Subject: [PATCH] Another compilation fix in EXPERIMENTAL_SCOREALIGN, and one
 less delete

---
 src/Menus.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 5f3ce1895..cec678249 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -5998,7 +5998,7 @@ class ASAProgress final : public SAProgress {
    long mTotalCells; // how many matrix cells?
    long mCellCount; // how many cells so far?
    long mPrevCellCount; // cell_count last reported with Update()
-   ProgressDialog *mProgress;
+   Maybe<ProgressDialog> mProgress;
    #ifdef COLLECT_TIMING_DATA
       FILE *mTimeFile;
       wxDateTime mStartTime;
@@ -6008,13 +6008,11 @@ class ASAProgress final : public SAProgress {
  public:
    ASAProgress() {
       smoothing = false;
-      mProgress = NULL;
       #ifdef COLLECT_TIMING_DATA
          mTimeFile = fopen("timing-data.txt", "w");
       #endif
    }
    ~ASAProgress() {
-      delete mProgress;
       #ifdef COLLECT_TIMING_DATA
          fclose(mTimeFile);
       #endif
@@ -6061,7 +6059,7 @@ class ASAProgress final : public SAProgress {
                     work[1], mFrames[1], is_audio[1]);
             fprintf(mTimeFile, "work2 = %g, work3 = %g\n", work2, work3);
          #endif
-         mProgress = new ProgressDialog(_("Synchronize MIDI with Audio"),
+         mProgress.create(_("Synchronize MIDI with Audio"),
                                _("Synchronizing MIDI and Audio Tracks"));
       } else if (i < 3) {
          fprintf(mTimeFile,
@@ -6122,7 +6120,7 @@ long mixer_process(void *mixer, float **buffer, long n)
 
 void AudacityProject::OnScoreAlign()
 {
-   TrackListIterator iter(mTracks);
+   TrackListIterator iter(GetTracks());
    Track *t = iter.First();
    int numWaveTracksSelected = 0;
    int numNoteTracksSelected = 0;