summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-01-05 18:30:06 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-01-05 18:30:06 +0100
commit02219fb46fff9312ec2bf3896fdee6dd537aaa0d (patch)
tree54d9f0af659c1b636693992ac0cbfbc093e3c411
parent234346f18caf775625bbe88ef2eb7c3b17f3321b (diff)
downloadsink-02219fb46fff9312ec2bf3896fdee6dd537aaa0d.tar.gz
sink-02219fb46fff9312ec2bf3896fdee6dd537aaa0d.zip
Avoid unnecessary warnings
-rw-r--r--common/resourcefacade.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 091970c..13cad64 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -64,8 +64,11 @@ typename ApplicationDomain::SinkResource::Ptr readFromConfig<ApplicationDomain::
64{ 64{
65 auto object = ApplicationDomain::SinkResource::Ptr::create(id); 65 auto object = ApplicationDomain::SinkResource::Ptr::create(id);
66 object->setProperty(ApplicationDomain::SinkResource::ResourceType::name, type); 66 object->setProperty(ApplicationDomain::SinkResource::ResourceType::name, type);
67 if (auto res = ResourceFactory::load(type)) { 67 //Apply the capabilities where we have capabilities
68 object->setCapabilities(res->capabilities()); 68 if (!ApplicationDomain::isGlobalType(type)) {
69 if (auto res = ResourceFactory::load(type)) {
70 object->setCapabilities(res->capabilities());
71 }
69 } 72 }
70 applyConfig(configStore, id, *object); 73 applyConfig(configStore, id, *object);
71 return object; 74 return object;