Merge branch 'v0.23.x'

2022-07-04 19:21:18 +02:00 · 2022-07-04 19:21:18 +02:00 · 7dd65f3028
parent bc56f8c2f0 2ee57f9b0d
commit 7dd65f3028
2 changed files with 4 additions and 1 deletions
--- a/2
+++ b/2
@ -17,6 +17,8 @@ ver 0.24 (not yet released)
 ver 0.23.8 (not yet released)
 * storage
  - curl: fix crash if web server does not understand WebDAV
+* output
+  - pipewire: fix crash with PipeWire 0.3.53

 ver 0.23.7 (2022/05/09)
 * database
--- a/src/output/plugins/PipeWireOutputPlugin.cxx
+++ b/src/output/plugins/PipeWireOutputPlugin.cxx
@ -234,7 +234,8 @@ private:
 				[[maybe_unused]] uint32_t id,
 				const struct pw_stream_control *control) noexcept {
 		auto &o = *(PipeWireOutput *)data;
-		if (StringIsEqual(control->name, "Channel Volumes"))
+		if (control->name != nullptr &&
+		    StringIsEqual(control->name, "Channel Volumes"))
 			o.ControlInfo(control);
 	}