From cbede041d25c84d0afc1d9eb1b592c7ada10bc0b Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Thu, 10 May 2018 19:10:33 -0500 Subject: [PATCH] be a little smarter about converting things (avoids confusing mingw 7.3) --- src/GUI/Plater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GUI/Plater.cpp b/src/GUI/Plater.cpp index d743cd37d..56a93f09d 100644 --- a/src/GUI/Plater.cpp +++ b/src/GUI/Plater.cpp @@ -280,7 +280,7 @@ std::vector Plater::load_model_objects(ModelObjectPtrs model_objects) { auto tmpobj {PlaterObject()}; const auto objfile {wxFileName::FileName( obj->input_file )}; - tmpobj.name = wxString(std::string() == obj->name ? obj->name : objfile.GetName()); + tmpobj.name = (std::string() == obj->name ? wxString(obj->name) : objfile.GetName()); tmpobj.identifier = (this->object_identifier)++; this->objects.push_back(tmpobj);