From fe11474219379d4ac28843cd69045f5af8e7a258 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Thu, 12 May 2016 16:45:08 -0400
Subject: [PATCH 1/2] Revert "Fix crashes (sometimes) when closing a project,
 due to overlays"

This reverts commit a33ca3ec3d1b129241745e278735415a1070e939.
---
 src/Project.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Project.cpp b/src/Project.cpp
index ab11508ee..5a4162592 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -1124,10 +1124,6 @@ AudacityProject::~AudacityProject()
                      wxCommandEventHandler(AudacityProject::OnCapture),
                      NULL,
                      this);
-
-   // Do this before destroying the overlays
-   delete mRuler;
-   mRuler = nullptr;
 }
 
 AudioIOStartStreamOptions AudacityProject::GetDefaultPlayOptions()

From 05fcf9cf82dc6b7a95099e9658f68afbddd2bbee Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Thu, 12 May 2016 16:46:04 -0400
Subject: [PATCH 2/2] Fix crashes (sometimes) when closing a project, due to
 overlays

---
 src/Project.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Project.cpp b/src/Project.cpp
index 5a4162592..a3564f73a 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -2416,8 +2416,10 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
       &mViewInfo);
 
    Destroy();
+   mRuler = nullptr;
 
    mIsBeingDeleted = true;
+
 }
 
 void AudacityProject::OnOpenAudioFile(wxCommandEvent & event)