From d433ac2f10bda5fd018568c6a1ed31261c4e68a6 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Tue, 18 Jul 2017 21:47:20 -0700
Subject: [PATCH] clang 7.3 fix (ugh), and version bump.

---
 CHANGELOG.txt                          | 9 +++++++++
 CMakeLists.txt                         | 2 +-
 src/musikbox/app/layout/MainLayout.cpp | 4 ++--
 src/musikbox/app/util/Version.h        | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6e9473916..1c9f306b5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+0.21.2
+
+* "add tracks", "add category", and "select playlist" context menus now remember
+  the last selected item for 60 seconds. this makes adding multiple things to
+  the same playlist (or play queue) much easier. 
+* fixed startup crash on older versions of macos
+
+--------------------------------------------------------------------------------
+
 0.21.1
 
 * arrow keys can now select items in the shortcuts window while focused.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53c14e8a6..c4c5638d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 project(musikbox)
 set (musikbox_VERSION_MAJOR 0)
 set (musikbox_VERSION_MINOR 20)
-set (musikbox_VERSION_PATCH 1)
+set (musikbox_VERSION_PATCH 2)
 set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
 
 include(CMakeToolsHelpers OPTIONAL)
diff --git a/src/musikbox/app/layout/MainLayout.cpp b/src/musikbox/app/layout/MainLayout.cpp
index 6f33c5641..e05ea17f6 100755
--- a/src/musikbox/app/layout/MainLayout.cpp
+++ b/src/musikbox/app/layout/MainLayout.cpp
@@ -315,8 +315,8 @@ bool MainLayout::KeyPress(const std::string& key) {
 
 void MainLayout::Start() {
 #if (__clang_major__ == 7 && __clang_minor__ == 3)
-    std::enable_shared_from_this<LayoutBase>* receiver =
-        (std::enable_shared_from_this<LayoutBase>*) this;
+    std::enable_shared_from_this<MainLayout>* receiver =
+        (std::enable_shared_from_this<MainLayout>*) this;
 #else
     auto receiver = this;
 #endif
diff --git a/src/musikbox/app/util/Version.h b/src/musikbox/app/util/Version.h
index ffa4a15f5..37e164901 100644
--- a/src/musikbox/app/util/Version.h
+++ b/src/musikbox/app/util/Version.h
@@ -2,5 +2,5 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 20
-#define VERSION_PATCH 1
-#define VERSION "0.20.1"
+#define VERSION_PATCH 2
+#define VERSION "0.20.2"