From 796b98de8b84255592d0d165ebd10ae86d919b3c Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sat, 10 Sep 2016 20:00:32 +0100
Subject: [PATCH] Bug 1510 - Moonphase: Crash cancelling Save As... character
 replacement dialogue when exporting multiple by tracks

Bug no longer moonphase when exporting stereo.  Iterator is iterating through channels, not tracks, so we need to allow for that when we skip whole tracks.
---
 src/export/ExportMultiple.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index db29ed1cf..e41ef2be5 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -886,6 +886,14 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
          continue;
       }
 
+      // Bug 1510 possibly increment iter, before deciding whether to export.
+      // Check for a linked track
+      tr2 = NULL;
+      if (tr->GetLinked()) {
+         tr2 = iter.Next();
+      }
+
+      wxLogDebug( "Get setting %i", count );
       /* get the settings to use for the export from the array */
       activeSetting = exportSettings[count];
       if( activeSetting.destfile.GetName().IsEmpty() ){
@@ -895,15 +903,9 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
 
       /* Select the track */
       tr->SetSelected(true);
-
-      // Check for a linked track
-      tr2 = NULL;
-      if (tr->GetLinked()) {
-         tr2 = iter.Next();
-         if (tr2) {
-            // Select it also
-            tr2->SetSelected(true);
-         }
+      if (tr2) {
+         // Select it also
+         tr2->SetSelected(true);
       }
 
       // Export the data. "channels" are per track.