From bc60de2ffa96761fd43638feccb682189b5f3431 Mon Sep 17 00:00:00 2001
From: Steve Daulton <stevedaulton@gmail.com>
Date: Sat, 3 Nov 2018 14:59:51 +0000
Subject: [PATCH] Disable Scrub Ruler by default

---
 src/AdornedRulerPanel.cpp   | 6 +-----
 src/tracks/ui/Scrubbing.cpp | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
index b8a71ae71..9eeecf4bc 100644
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@@ -904,12 +904,8 @@ namespace {
    bool ReadScrubEnabledPref()
    {
       bool result {};
-// DA: Scrub is disabled by default.
-#ifdef EXPERIMENTAL_DA
       gPrefs->Read(scrubEnabledPrefName, &result, false);
-#else
-      gPrefs->Read(scrubEnabledPrefName, &result, true);
-#endif
+
       return result;
    }
 
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 18f94b0bd..86ff77b82 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -258,7 +258,7 @@ namespace {
 
       { wxT("ToggleScrubRuler"),            XO("Scrub &Ruler"),   wxT(""),
          AlwaysEnabledFlag,
-         &Scrubber::OnToggleScrubRuler, true,    &Scrubber::ShowsBar,
+         &Scrubber::OnToggleScrubRuler, false,    &Scrubber::ShowsBar,
       },
    };