From b7d211dfec0b13fe0df08bbeedefe8dbdcd78fbd Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Mon, 18 Apr 2016 23:10:32 -0400
Subject: [PATCH 1/2] fix build

---
 src/tracks/ui/Scrubbing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 926a73b75..f752cb178 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -318,10 +318,10 @@ void Scrubber::StopScrubbing()
          ControlToolBar *const ctb = mProject->GetControlToolBar();
          ctb->StopPlaying();
       }
-      return true;
+      return;
    }
    else
-      return false;
+      return;
 }
 
 bool Scrubber::IsScrubbing() const

From e48c80d13bf716db3decc6a4ce1c9f777b0bd02b Mon Sep 17 00:00:00 2001
From: Gale Andrews <gale@audacityteam.org>
Date: Tue, 19 Apr 2016 14:04:34 +0100
Subject: [PATCH 2/2] Don't disable "Select Destination Location" wizard

---
 win/audacity.iss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/win/audacity.iss b/win/audacity.iss
index d0a59b545..a7733188c 100755
--- a/win/audacity.iss
+++ b/win/audacity.iss
@@ -52,6 +52,10 @@ VersionInfoDescription={#AppName + " " + AppVersion + " Setup"}
 VersionInfoVersion={#GetFileVersion(AppExe)}
 VersionInfoCopyright={#GetFileCopyright(AppExe)}
 
+; Don't disable the "Select Destination Location" wizard, even if 
+; Audacity is already installed.
+DisableDirPage=no
+
 ; Always warn if dir exists, because we'll overwrite previous Audacity.
 DirExistsWarning=yes
 DisableProgramGroupPage=yes