From b11f57a643c7e7031d625767704f1e93725d678b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Wed, 19 Aug 2015 11:52:31 -0400
Subject: [PATCH] Fix bugs in retraction of Waveforms preferences page

---
 src/WaveTrack.cpp         | 8 --------
 src/prefs/PrefsDialog.cpp | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp
index cdf207283..07da0ebe8 100644
--- a/src/WaveTrack.cpp
+++ b/src/WaveTrack.cpp
@@ -120,14 +120,6 @@ WaveTrack::WaveTrack(WaveTrack &orig):
    , mpWaveformSettings(orig.mpWaveformSettings 
         ? new WaveformSettings(*orig.mpWaveformSettings) : 0)
 {
-   // Force creation always:
-   WaveformSettings &settings = GetIndependentWaveformSettings();
-
-   mDisplay = FindDefaultViewMode();
-   if (mDisplay == obsoleteWaveformDBDisplay) {
-      mDisplay = Waveform;
-      settings.scaleType = WaveformSettings::stLinear;
-   }
    mLastScaleType = -1;
 
    mLegacyProjectFileOffset = 0;
diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp
index c74d968c5..6b9f7e0ab 100644
--- a/src/prefs/PrefsDialog.cpp
+++ b/src/prefs/PrefsDialog.cpp
@@ -258,7 +258,8 @@ PrefsDialog::PrefsDialog
    S.AddStandardButtons(eOkButton | eCancelButton);
 
 #if defined(__WXGTK__)
-   mCategories->GetTreeCtrl()->EnsureVisible(mCategories->GetTreeCtrl()->GetRootItem());
+   if (mCategories)
+      mCategories->GetTreeCtrl()->EnsureVisible(mCategories->GetTreeCtrl()->GetRootItem());
 #endif
 
 //   mCategories->SetSizeHints(-1, -1, 790, 600);  // 790 = 800 - (border * 2)