diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-07 18:42:51 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-07 18:43:00 +0100 |
| commit | 6f23e91e335b3415080fcbc90cb9fc3cdcc4344f (patch) | |
| tree | 1bde9dd01839def96044973e7c7b2083c41d73a1 | |
| parent | 1bd8a322f52c3094b8d343f249f54b75a97bd598 (diff) | |
| download | mpd-6f23e91e335b3415080fcbc90cb9fc3cdcc4344f.tar.gz mpd-6f23e91e335b3415080fcbc90cb9fc3cdcc4344f.tar.xz mpd-6f23e91e335b3415080fcbc90cb9fc3cdcc4344f.zip | |
lib/upnp/ContentDirectoryService: swap uri_apply_base() parameters
When uri_apply_base() was moved from db/upnp/Util.cpp to
util/UriUtil.cpp, the parameter order was changed, however without
swapping the parameters in the ContentDirectoryService constructor.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/lib/upnp/ContentDirectoryService.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,6 @@ ver 0.19.3 (not yet released) +* database + - upnp: fix breakage due to malformed URIs * decoder - audiofile: fix crash while playing streams diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx index ee7c0d7f5..0e5d2d955 100644 --- a/src/lib/upnp/ContentDirectoryService.cxx +++ b/src/lib/upnp/ContentDirectoryService.cxx @@ -29,7 +29,7 @@ ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device, const UPnPService &service) - :m_actionURL(uri_apply_base(device.URLBase, service.controlURL)), + :m_actionURL(uri_apply_base(service.controlURL, device.URLBase)), m_serviceType(service.serviceType), m_deviceId(device.UDN), m_friendlyName(device.friendlyName), |