From e3a822c34dd50240675eda12e6daf8a741f536d0 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sun, 9 Jul 2017 14:07:56 +0100
Subject: [PATCH] Always Record on a new Track Pref.

Changed pref name, now unticked by default.
---
 src/Menus.cpp                   |  6 +++---
 src/prefs/RecordingPrefs.cpp    |  6 +++---
 src/toolbars/ControlToolBar.cpp | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 767794d5b..179f1871e 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -839,12 +839,12 @@ void AudacityProject::CreateMenusAndCommands()
       // The OnRecord2ndChoice function is: if normal record records beside,
       // it records below, if normal record records below, it records beside.
       // TODO: Do 'the right thing' with other options like TimerRecord.
-      bool bPreferAppend;
-      gPrefs->Read("/GUI/PreferAppendRecord",&bPreferAppend, true);
+      bool bPreferNewTrack;
+      gPrefs->Read("/GUI/PreferNewTrackRecord",&bPreferNewTrack, false);
       c->AddItem(  wxT("Record2ndChoice"), 
          // Our first choice is bound to R (by default) and gets the prime position.
          // We supply the name for the 'other one' here.  It should be bound to Shift+R 
-         bPreferAppend ? _("Record &New Track") : _("&Append Record"), 
+         bPreferNewTrack ? _("&Append Record") : _("Record &New Track"), 
          FN(OnRecord2ndChoice), 
          wxT("Shift+R")
       );
diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index b0dc7b862..77fac8cc2 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -160,9 +160,9 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(_("Options"));
    {
-       S.TieCheckBox(_("Record &appends, instead of recording new track"),
-                    wxT("/GUI/PreferAppendRecord"),
-                    true);
+       S.TieCheckBox(_("Always record on a new track"),
+                    wxT("/GUI/PreferNewTrackRecord"),
+                    false);
    }
    S.EndStatic();
 
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 728ac8fdf..0a24814b2 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -197,9 +197,9 @@ void ControlToolBar::Populate()
    mRecord = MakeButton(bmpRecord, bmpRecord, bmpRecordDisabled,
       ID_RECORD_BUTTON, true, _("Record"));
 
-   bool bPreferAppend;
-   gPrefs->Read("/GUI/PreferAppendRecord",&bPreferAppend, true);
-   if( bPreferAppend )
+   bool bPreferNewTrack;
+   gPrefs->Read("/GUI/PreferNewTrackRecord",&bPreferNewTrack, false);
+   if( !bPreferNewTrack )
       MakeAlternateImages(*mRecord, 1, bmpRecordBelow, bmpRecordBelow,
          bmpRecordBelowDisabled);
    else
@@ -241,9 +241,9 @@ void ControlToolBar::RegenerateTooltips()
             // Without shift
             //commands.push_back(wxT("Record"));
             commands.push_back(wxT("Record1stChoice"));
-            {  bool bPreferAppend;
-               gPrefs->Read("/GUI/PreferAppendRecord",&bPreferAppend, true);
-               if( bPreferAppend ){
+            {  bool bPreferNewTrack;
+               gPrefs->Read("/GUI/PreferNewTrackRecord",&bPreferNewTrack, false);
+               if( !bPreferNewTrack ){
                   commands.push_back(_("Record New Track"));
                } else {
                   commands.push_back(_("Append Record"));
@@ -922,9 +922,9 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
 
    bool shifted = mRecord->WasShiftDown();
 
-   bool bPreferAppend;
-   gPrefs->Read("/GUI/PreferAppendRecord",&bPreferAppend, true);
-   if( bPreferAppend )
+   bool bPreferNewTrack;
+   gPrefs->Read("/GUI/PreferNewTrackRecord",&bPreferNewTrack, false);
+   if( !bPreferNewTrack )
       shifted = !shifted;
 
    TrackList *trackList = p->GetTracks();