From 032c321fd32a47b55687c3447ca3a95f4b4e014f Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 12 Nov 2019 01:30:19 -0500 Subject: [PATCH] Port change from v1 26bda06eb7124df3c4403941489981b382c62145 --- src/engine/Engine.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index b414b1cf..3944dfa4 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -1012,11 +1012,14 @@ Module* moduleFromJson(json_t* moduleJ) { json_t* pluginSlugJ = json_object_get(moduleJ, "plugin"); if (!pluginSlugJ) throw Exception("\"plugin\" property not found in module JSON"); + std::string pluginSlug = json_string_value(pluginSlugJ); + pluginSlug = plugin::normalizeSlug(pluginSlug); + json_t* modelSlugJ = json_object_get(moduleJ, "model"); if (!modelSlugJ) throw Exception("\"model\" property not found in module JSON"); - std::string pluginSlug = json_string_value(pluginSlugJ); std::string modelSlug = json_string_value(modelSlugJ); + modelSlug = plugin::normalizeSlug(modelSlug); // Get Model plugin::Model* model = plugin::getModel(pluginSlug, modelSlug);