Fix a few problems related to the rebase

This commit is contained in:
Francesco Abbate 2021-06-04 17:16:28 +02:00
parent abf00254f1
commit 78bb96cf72
1 changed files with 3 additions and 3 deletions

View File

@ -200,8 +200,8 @@ end
function core.scan_project_folder(dirname, filename) function core.scan_project_folder(dirname, filename)
for _, dir in ipairs(core.project_directories) do for _, dir in ipairs(core.project_entries) do
if dir.name == dirname then if dir.item.type == 'dir' and dir.name == dirname then
for i, file in ipairs(dir.files) do for i, file in ipairs(dir.files) do
local file = dir.files[i] local file = dir.files[i]
if file.filename == filename then if file.filename == filename then
@ -483,7 +483,7 @@ function core.init()
do do
-- FIXME: change the name for "recents_open" -- FIXME: change the name for "recents_open"
local window_position local window_position, window_mode
core.recent_projects, core.recents_open, window_position, window_mode = load_session() core.recent_projects, core.recents_open, window_position, window_mode = load_session()
if window_mode == "normal" then if window_mode == "normal" then
system.set_window_size(table.unpack(window_position)) system.set_window_size(table.unpack(window_position))