Merge remote-tracking branch 'origin/master' into feature/statlogs

This commit is contained in:
Matthew Territo
2017-07-13 09:06:13 -06:00
37 changed files with 2293 additions and 2137 deletions
+1 -1
View File
@@ -97,7 +97,7 @@ public:
ModuleSubClass* module() const {
auto it = std::find_if(_modules.begin(), _modules.end(),
[](const std::unique_ptr<OpenSpaceModule>& module) {
return module->name() == ModuleSubClass::name;
return module->name() == ModuleSubClass::Name;
});
if (it != _modules.end()) {
return dynamic_cast<ModuleSubClass*>(it->get());