Commit b74a9142 authored by Max Kellermann's avatar Max Kellermann

Merge tag 'v0.21.25'

release v0.21.25
parents 9964a5ff c67372f8
...@@ -40,11 +40,12 @@ ver 0.22 (not yet released) ...@@ -40,11 +40,12 @@ ver 0.22 (not yet released)
* switch to C++17 * switch to C++17
- GCC 7 or clang 4 (or newer) recommended - GCC 7 or clang 4 (or newer) recommended
ver 0.21.25 (not yet released) ver 0.21.25 (2020/07/06)
* protocol: * protocol:
- fix crash when using "rangeid" while playing - fix crash when using "rangeid" while playing
* database * database
- simple: automatically scan new mounts - simple: automatically scan new mounts
- upnp: fix compatibility with Plex DLNA
* storage * storage
- fix disappearing mounts after mounting twice - fix disappearing mounts after mounting twice
- udisks: fix reading ".mpdignore" - udisks: fix reading ".mpdignore"
......
...@@ -90,8 +90,17 @@ public: ...@@ -90,8 +90,17 @@ public:
} }
gcc_pure gcc_pure
bool IsRoot() const noexcept {
return type == Type::CONTAINER && id == "0";
}
gcc_pure
bool Check() const noexcept { bool Check() const noexcept {
return !id.empty() && !parent_id.empty() && !name.empty() && return !id.empty() &&
/* root nodes don't need a parent id and a
name */
(IsRoot() || (!parent_id.empty() &&
!name.empty())) &&
(type != UPnPDirObject::Type::ITEM || (type != UPnPDirObject::Type::ITEM ||
item_class != UPnPDirObject::ItemClass::UNKNOWN); item_class != UPnPDirObject::ItemClass::UNKNOWN);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment