From 0a81ea131d57681dd68b0fdd0446d1260440a7d7 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Mon, 26 Jun 2017 19:24:21 -0700
Subject: [PATCH] Bumped version for release and fixed a couple minor bugs.

---
 CHANGELOG.txt                                  | 18 ++++++++++++++++++
 CMakeLists.txt                                 |  6 +++---
 .../library/query/local/SavePlaylistQuery.cpp  | 16 +++++++++-------
 src/musikbox/app/util/Hotkeys.cpp              | 11 ++++-------
 src/musikbox/app/util/Version.h                |  2 +-
 5 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1688d43ba..638362c40 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,21 @@
+0.18.0
+
+user-facing:
+
+* added first-class support for browse playlists:
+  - press `5` in browse view to view playlists
+  - press `M-r` to rename the selected playlist
+  - press `M-s` to save the selected playlist
+  - highlight the left pane, and press `DEL` (`BACKSPACE` on macos) to delete
+    the selected playlist
+  - press `M-up` to move the selected track up
+  - press `M-down` to move the selected track down
+  - highlight the right pane, and press `DEL` (`BACKSPACE` on macos) to delete
+    the selected track from the playlist
+* added view titles in library browse mode
+
+--------------------------------------------------------------------------------
+
 0.17.2
 
 user-facing:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76a23ba4a..a7df47113 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 3.0)
 
 project(musikbox)
 set (musikbox_VERSION_MAJOR 0)
-set (musikbox_VERSION_MINOR 17)
-set (musikbox_VERSION_PATCH 2)
+set (musikbox_VERSION_MINOR 18)
+set (musikbox_VERSION_PATCH 0)
 set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
 
 include(CMakeToolsHelpers OPTIONAL)
@@ -24,7 +24,7 @@ ExternalProject_Add(taglib
     INSTALL_COMMAND make install
 )
 
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11 -Wno-unused-result -Wno-deprecated-declarations")
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++14 -Wno-unused-result -Wno-deprecated-declarations")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
 
diff --git a/src/core/library/query/local/SavePlaylistQuery.cpp b/src/core/library/query/local/SavePlaylistQuery.cpp
index 7e1055909..4a13d9fe9 100644
--- a/src/core/library/query/local/SavePlaylistQuery.cpp
+++ b/src/core/library/query/local/SavePlaylistQuery.cpp
@@ -199,14 +199,16 @@ bool SavePlaylistQuery::AddTracksToPlaylist(
     TrackPtr track;
     for (size_t i = 0; i < tracks->Count(); i++) {
         track = tracks->Get(i);
-        insertTrack.Reset();
-        insertTrack.BindText(0, track->GetValue("external_id"));
-        insertTrack.BindText(1, track->GetValue("source_id"));
-        insertTrack.BindInt64(2, playlistId);
-        insertTrack.BindInt32(3, offset++);
+        if (track) {
+            insertTrack.Reset();
+            insertTrack.BindText(0, track->GetValue("external_id"));
+            insertTrack.BindText(1, track->GetValue("source_id"));
+            insertTrack.BindInt64(2, playlistId);
+            insertTrack.BindInt32(3, offset++);
 
-        if (insertTrack.Step() == db::Error) {
-            return false;
+            if (insertTrack.Step() == db::Error) {
+                return false;
+            }
         }
     }
 
diff --git a/src/musikbox/app/util/Hotkeys.cpp b/src/musikbox/app/util/Hotkeys.cpp
index 80d10021b..c89ac0b7e 100755
--- a/src/musikbox/app/util/Hotkeys.cpp
+++ b/src/musikbox/app/util/Hotkeys.cpp
@@ -226,13 +226,10 @@ bool Hotkeys::Is(Id id, const std::string& kn) {
         return (custom->second == kn);
     }
 
-    /* otherwise, let's compare against the default key, assuming the
-    input key doesn't match ANY that the user has customized */
-    if (customKeys.find(kn) == customKeys.end()) {
-        auto it = ID_TO_DEFAULT.find(id);
-        if (it != ID_TO_DEFAULT.end() && it->second == kn) {
-            return true;
-        }
+    /* otherwise, let's compare against the default key */
+    auto it = ID_TO_DEFAULT.find(id);
+    if (it != ID_TO_DEFAULT.end() && it->second == kn) {
+        return true;
     }
 
     return false;
diff --git a/src/musikbox/app/util/Version.h b/src/musikbox/app/util/Version.h
index 7a8489ae9..110356d70 100644
--- a/src/musikbox/app/util/Version.h
+++ b/src/musikbox/app/util/Version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION "0.17.2"
+#define VERSION "0.18.0"