From faaca028e7c7ed43069f22f5dc45adf87a521ec0 Mon Sep 17 00:00:00 2001
From: Zijie He <zijiehe@chromium.org>
Date: Wed, 8 Feb 2017 12:41:22 -0800
Subject: [PATCH] Remove empty sidecar folder

---
 frontend/apps/filemanager/filemanager.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua
index 8929cb8a7..29806c05c 100644
--- a/frontend/apps/filemanager/filemanager.lua
+++ b/frontend/apps/filemanager/filemanager.lua
@@ -165,6 +165,10 @@ function FileManager:init()
                     callback = function()
                         local full_path = util.realpath(file)
                         os.remove(DocSettings:getSidecarFile(full_path))
+                        -- If the sidecar folder is empty, os.remove() can
+                        -- delete it. Otherwise, the following statement has no
+                        -- effect.
+                        os.remove(DocSettings:getSidecarDir(full_path))
                         self:refreshPath()
                         -- also remove from history if present
                         local readhistory = require("readhistory")