From b2f4d358aed59f948845610d6eb6854561c3cd36 Mon Sep 17 00:00:00 2001 From: Tigran Aivazian Date: Fri, 21 Sep 2012 08:17:53 +0100 Subject: [PATCH 1/2] Bugfix for deleting a directory: After a directory is deleted it is still shown in the filemanager list, so you can accidentally delete another directory as all the pointers after the previously deleted entry are wrong (shifted by one). --- filechooser.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filechooser.lua b/filechooser.lua index ce6332a7d..f5e16b526 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -361,16 +361,16 @@ function FileChooser:addAllCommands() local pos = self.perpage*(self.page-1)+self.current local folder = self.dirs[pos] if folder == ".." then - showInfoMsgWithDelay(".. cannot be deleted! ",2000,1) + showInfoMsgWithDelay(".. cannot be deleted! ",1500,1) elseif folder then InfoMessage:show("Press \'Y\' to confirm",0) if self:ReturnKey() == KEY_Y then if lfs.rmdir(self.path.."/"..folder) then table.remove(self.dirs, offset) self.items = self.items - 1 - self.current = self.current - 1 + self:setPath(self.path) else - showInfoMsgWithDelay("Cannot be deleted!",2000,1) + showInfoMsgWithDelay("Cannot be deleted!",1500,1) end end else From 6cd66a3e79df8f94a4d8ccd20b85ac1af2b4b2b9 Mon Sep 17 00:00:00 2001 From: Tigran Aivazian Date: Fri, 21 Sep 2012 08:26:13 +0100 Subject: [PATCH 2/2] No need to set self.items after deleting a directory as it is recalculated in self:setPath() anyway. --- filechooser.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/filechooser.lua b/filechooser.lua index f5e16b526..0bb80cf4d 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -367,7 +367,6 @@ function FileChooser:addAllCommands() if self:ReturnKey() == KEY_Y then if lfs.rmdir(self.path.."/"..folder) then table.remove(self.dirs, offset) - self.items = self.items - 1 self:setPath(self.path) else showInfoMsgWithDelay("Cannot be deleted!",1500,1)