From f2e452970741a47bc130ede0a96313b26f9df856 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sat, 22 May 2021 17:31:52 +0200
Subject: [PATCH 1/3] increment version number to 0.22.8

---
 NEWS                        | 2 ++
 android/AndroidManifest.xml | 4 ++--
 doc/conf.py                 | 2 +-
 meson.build                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index cf4853bff..6b89726c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.22.8 (not yet released)
+
 ver 0.22.7 (2021/05/19)
 * protocol
   - don't use glibc extension to parse time stamps
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index bf659dc64..ca4591b97 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="55"
-          android:versionName="0.22.7">
+          android:versionCode="56"
+          android:versionName="0.22.8">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
diff --git a/doc/conf.py b/doc/conf.py
index 4d59eb749..347fe99f4 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.22.7'
+version = '0.22.8'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/meson.build b/meson.build
index 14f67190a..9cf0c7ba3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.22.7',
+  version: '0.22.8',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c11',

From 0e49de867de8b7f8793b4b628cfe4125c40459ec Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 21 May 2021 19:30:28 +0200
Subject: [PATCH 2/3] input/last: add nullptr check to Open(), fixes assertion
 failure

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1168
---
 NEWS                          | 1 +
 src/input/LastInputStream.hxx | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6b89726c5..93030ee9e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 ver 0.22.8 (not yet released)
+* fix crash bug in "albumart" command (0.22.7 regression)
 
 ver 0.22.7 (2021/05/19)
 * protocol
diff --git a/src/input/LastInputStream.hxx b/src/input/LastInputStream.hxx
index 2121772a0..635e87741 100644
--- a/src/input/LastInputStream.hxx
+++ b/src/input/LastInputStream.hxx
@@ -69,7 +69,8 @@ public:
 
 		is = open(new_uri, mutex);
 		uri = std::forward<U>(new_uri);
-		ScheduleClose();
+		if (is)
+			ScheduleClose();
 		return is.get();
 	}
 

From 14465be8478c3608f915cf4eeae84d53799c9254 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sat, 22 May 2021 17:33:36 +0200
Subject: [PATCH 3/3] release v0.22.8

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 93030ee9e..612de9966 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-ver 0.22.8 (not yet released)
+ver 0.22.8 (2021/05/22)
 * fix crash bug in "albumart" command (0.22.7 regression)
 
 ver 0.22.7 (2021/05/19)