diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-07 19:41:19 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-07 19:41:19 +0100 |
| commit | 2d9876a261d62192b5ce976eae376ac4e1fd4b38 (patch) | |
| tree | 7ad2b73867f1bf0a76d8058df30e0ad68aa42c97 /src/lib | |
| parent | 303d67aed2da79d4ddaa3a52093ed42ae9da064d (diff) | |
| parent | 125eb01e03082f1c33fa1b0b6d51b953eebf6c28 (diff) | |
| download | mpd-2d9876a261d62192b5ce976eae376ac4e1fd4b38.tar.gz mpd-2d9876a261d62192b5ce976eae376ac4e1fd4b38.tar.xz mpd-2d9876a261d62192b5ce976eae376ac4e1fd4b38.zip | |
Merge branch 'v0.19.x'
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/upnp/ContentDirectoryService.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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), |