fix editor launch bug

ejoy · Mar 25, 2024 · b288950 · b288950
1 parent 01ebb90
commit b288950
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 25 deletions.
diff --git a/tools/editor/launch/.mount b/tools/editor/launch/.mount
@@ -2,4 +2,3 @@ mount:
     /engine/ %engine%/engine
     /pkg/    %engine%/pkg
     /        %project%
-    /        %project%/..
diff --git a/tools/editor/launch/pkg/launch/editor_setting.lua b/tools/editor/launch/pkg/launch/editor_setting.lua
@@ -4,7 +4,7 @@ local lfs       = require "bee.filesystem"
 local datalist  = require "datalist"
 local fastio    = require "fastio"
 
-local settingpath = lfs.path(vfs.repopath()):parent_path():parent_path():string().."/pkg/tools.editor/editor.settings"
+local settingpath = lfs.path(vfs.repopath()):parent_path():string().."/pkg/tools.editor/editor.settings"
 local editor_setting = lfs.exists(settingpath) and datalist.parse(fastio.readall_f(settingpath)) or {}
 
 local function save()

diff --git a/tools/editor/launch/pkg/launch/imgui.layout b/tools/editor/launch/pkg/launch/imgui.layout
diff --git a/tools/editor/pkg/tools.editor/common/global_data.lua b/tools/editor/pkg/tools.editor/common/global_data.lua
@@ -4,7 +4,7 @@ local lfs               = require "bee.filesystem"
 local vfs               = require "vfs"
 local access            = require "common.vfs_access"
 m.repo_access = access
-m.editor_root = lfs.path(vfs.repopath())
+m.editor_root = (lfs.path(vfs.repopath()):filename():string() == "launch") and lfs.path(vfs.repopath()):parent_path() or lfs.path(vfs.repopath())
 
 local function get_package(entry_path, readmount)
     local repo = {_root = entry_path}