PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

critical fix

Browse Source
This commit is contained in:
MihailRis 2024-03-20 19:09:50 +03:00
parent 6f351e2b79
commit e5fb9a9a23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/UiDocument.cpp
View File

@ -62,9 +62,11 @@ std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string namesp, fs::p
const std::string text = files::read_string(file); const std::string text = files::read_string(file);
auto xmldoc = xml::parse(file.u8string(), text); auto xmldoc = xml::parse(file.u8string(), text);
auto env = penv == -1 ? nullptr : scripting::create_doc_environment(penv, namesp); auto env = penv == -1
scripting::Environment envview {penv == -1 ? 0 : env->getId()}; ? std::make_unique<scripting::Environment>(0)
gui::UiXmlReader reader(envview); : scripting::create_doc_environment(penv, namesp);
gui::UiXmlReader reader(*env);
InventoryView::createReaders(reader); InventoryView::createReaders(reader);
auto view = reader.readXML( auto view = reader.readXML(
file.u8string(), xmldoc->getRoot() file.u8string(), xmldoc->getRoot()
@ -73,9 +75,9 @@ std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string namesp, fs::p
uidocscript script {}; uidocscript script {};
auto scriptFile = fs::path(file.u8string()+".lua"); auto scriptFile = fs::path(file.u8string()+".lua");
if (fs::is_regular_file(scriptFile)) { if (fs::is_regular_file(scriptFile)) {
scripting::load_layout_script(envview.getId(), namesp, scriptFile, script); scripting::load_layout_script(env->getId(), namesp, scriptFile, script);
} }
return std::make_unique<UiDocument>(namesp, script, view, penv == -1 ? nullptr : std::move(env)); return std::make_unique<UiDocument>(namesp, script, view, std::move(env));
} }
std::shared_ptr<gui::UINode> UiDocument::readElement(fs::path file) { std::shared_ptr<gui::UINode> UiDocument::readElement(fs::path file) {