From 9ed80ec83579a90d5c6369f134d0c8abdd2eecc5 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 24 Nov 2024 12:09:46 +0300
Subject: [PATCH] disable traceback lines with non-existing files

---
 res/layouts/console.xml.lua              |  6 ++----
 res/layouts/templates/stack_frame.xml    |  2 +-
 src/assets/assetload_funcs.cpp           | 10 +++++++++-
 src/logic/scripting/lua/libs/libfile.cpp |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index 7d4c2771..11d7bd14 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -84,13 +84,11 @@ events.on("core:open_traceback", function(traceback_b64)
             framestr = framestr.."("..tostring(frame.name)..")"
         end
         local color = "#FFFFFF"
-        if frame.source:starts_with("core:") then
-            color = "#C0D0C5"
-        end
         tb_list:add(gui.template("stack_frame", {
             location=framestr, 
             color=color,
-            callback=callback
+            callback=callback,
+            enabled=file.exists(frame.source)
         }))
     end
     tb_list.size = srcsize
diff --git a/res/layouts/templates/stack_frame.xml b/res/layouts/templates/stack_frame.xml
index c73890bb..16f2571c 100644
--- a/res/layouts/templates/stack_frame.xml
+++ b/res/layouts/templates/stack_frame.xml
@@ -1,3 +1,3 @@
-<label hover-color="#A0A0FF" interactive="true" onclick="%{callback}" color="%{color}">
+<label hover-color="#A0A0FF" interactive="true" onclick="%{callback}" color="%{color}" enabled="%{enabled}">
     %{location}
 </label>
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index 813d1c87..ffe7cc25 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -185,8 +185,16 @@ assetload::postfunc assetload::layout(
     return [=](auto assets) {
         try {
             auto cfg = std::dynamic_pointer_cast<LayoutCfg>(config);
+            size_t pos = name.find(':');
+            auto prefix = name.substr(0, pos);
             assets->store(
-                UiDocument::read(cfg->env, name, file, "abs:" + file), name
+                UiDocument::read(
+                    cfg->env,
+                    name,
+                    file,
+                    prefix + ":layouts/" + name.substr(pos + 1) + ".xml"
+                ),
+                name
             );
         } catch (const parsing_error& err) {
             throw std::runtime_error(
diff --git a/src/logic/scripting/lua/libs/libfile.cpp b/src/logic/scripting/lua/libs/libfile.cpp
index d436bdfd..c705d866 100644
--- a/src/logic/scripting/lua/libs/libfile.cpp
+++ b/src/logic/scripting/lua/libs/libfile.cpp
@@ -19,7 +19,7 @@ static fs::path resolve_path(const std::string& path) {
 
 static fs::path resolve_path_soft(const std::string& path) {
     if (path.find(':') == std::string::npos) {
-        return path;
+        return fs::u8path("");
     }
     return engine->getPaths()->resolve(path, false);
 }