2 files changed, 4 insertions, 3 deletions
diff --git a/server/contentDirectory.cpp b/server/contentDirectory.cpp
index 4855715..b7d11ce 100644
--- a/server/contentDirectory.cpp
+++ b/server/contentDirectory.cpp
@@ -86,6 +86,7 @@ void cContentDirectory::Action(){
     /* The container update IDs as CSV list */
     UpnpAddToPropertySet(&PropertySet, "ContainerUpdateIDs",
         tools::IdListToCSV(mMediaServer->GetManager().GetContainerUpdateIDs()).c_str());
+
     int ret = UpnpNotifyExt(this->mDeviceHandle, this->mMediaServer->GetDeviceUUID().c_str(),
                             this->mServiceDescription.serviceID.c_str(), PropertySet);
     ixmlDocument_free(PropertySet);
@@ -193,7 +194,7 @@ int cContentDirectory::CreateObject(Upnp_Action_Request* request){
 int cContentDirectory::Search(Upnp_Action_Request* request){
   cMediaManager::SearchRequest searchRequest;
 
-  if(this->ParseIntegerValue(request->ActionRequest, "ContainerID", searchRequest.objectID)){
+  if(this->ParseStringValue(request->ActionRequest, "ContainerID", searchRequest.objectID)){
     esyslog("UPnP\tInvalid arguments. ObjectID missing or wrong");
     this->SetError(request, UPNP_SOAP_E_INVALID_ARGS);
     return request->ErrCode;
@@ -260,7 +261,7 @@ int cContentDirectory::Search(Upnp_Action_Request* request){
 int cContentDirectory::Browse(Upnp_Action_Request* request){
   cMediaManager::BrowseRequest browseRequest;
 
-  if(this->ParseIntegerValue(request->ActionRequest, "ObjectID", browseRequest.objectID)){
+  if(this->ParseStringValue(request->ActionRequest, "ObjectID", browseRequest.objectID)){
     esyslog("UPnP\tInvalid arguments. ObjectID missing or wrong");
     this->SetError(request, UPNP_SOAP_E_INVALID_ARGS);
     return request->ErrCode;
diff --git a/server/server.cpp b/server/server.cpp
index 9858029..32c584d 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -314,7 +314,7 @@ const char* cMediaServer::RuntimeException::what() const throw() {
 }
 
 bool cMediaServer::CheckDeviceUUID(string deviceUUID) const {
-  return deviceUUID.compare(mCurrentConfiguration.deviceUUID) == 0;
+  return deviceUUID.find(mCurrentConfiguration.deviceUUID) != string::npos;
 }
 
 cMediaServer::Description::Description(