From a0825ecf03ef395297a3b42d6dd4b46a82ba3482 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sat, 28 Jul 2018 20:44:55 +0200 Subject: [PATCH] [fix] Don't crash when trying to go to deleted folders (#4110) --- frontend/apps/filemanager/filemanager.lua | 1 + frontend/apps/filemanager/filemanagerutil.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index 4fd547e21..ef9af6bed 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -47,6 +47,7 @@ local function restoreScreenMode() end local function truncatePath(text) + if not text then return "" end local screen_width = Screen:getWidth() local face = Font:getFace("xx_smallinfofont") -- we want to truncate text on the left, so work with the reverse of text (which is fine as we don't use kerning) diff --git a/frontend/apps/filemanager/filemanagerutil.lua b/frontend/apps/filemanager/filemanagerutil.lua index 567943bd8..8fb9289df 100644 --- a/frontend/apps/filemanager/filemanagerutil.lua +++ b/frontend/apps/filemanager/filemanagerutil.lua @@ -21,6 +21,7 @@ function filemanagerutil.getDefaultDir() end function filemanagerutil.abbreviate(path) + if not path then return "" end local home_dir_name = G_reader_settings:readSetting("home_dir_display_name") if home_dir_name ~= nil then local home_dir = G_reader_settings:readSetting("home_dir") or filemanagerutil.getDefaultDir()