提交 2d1b0666 编写于 作者: R Ryan Foster 提交者: Jim

UI: Prevent name collision during scene collection import

The Scene Collection Importer would attempt to set the new filename
using the name property of the scene collection. However, it would
determine an unused filename, and then replace spaces with underscores,
which could cause a name collision. This changes the importer to replace
spaces with underscores first for the base filename, and then determine
an unused filename.
上级 89b4e913
......@@ -577,11 +577,12 @@ void OBSImporter::importCollections()
json11::Json::object out = res.object_items();
QString file = res["name"].string_value().c_str();
file.replace(" ", "_");
bool safe = !CheckConfigExists(dst, file);
int x = 1;
while (!safe) {
file = name;
file += " (";
file += "_(";
file += QString::number(x);
file += ")";
......@@ -593,7 +594,7 @@ void OBSImporter::importCollections()
std::string save = dst;
save += "/";
save += file.replace(" ", "_").toStdString();
save += file.toStdString();
save += ".json";
std::string out_str = json11::Json(out).dump();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册