From 5cb550d471eab8e2d62abe5a18daabad84cd040f Mon Sep 17 00:00:00 2001
From: WS64 <ws64@hotmail.com>
Date: Mon, 11 Aug 2014 19:43:43 +0200
Subject: [PATCH 1/3] Change behaviour when LIBRARY_PATH is nil

---
 frontend/apps/filemanager/filemanagersearch.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/apps/filemanager/filemanagersearch.lua b/frontend/apps/filemanager/filemanagersearch.lua
index 901965a3a..392dd92bf 100644
--- a/frontend/apps/filemanager/filemanagersearch.lua
+++ b/frontend/apps/filemanager/filemanagersearch.lua
@@ -70,7 +70,12 @@ function Search:init()
 
     -- check if we find the calibre file
     if LIBRARY_PATH == nil then 
-          error = "LIBRARY_PATH in DEFAULTS.LUA is not set!"
+          self.calibrefile = findcalibre("/mnt")
+          if not self.calibrefile then
+              error = "LIBRARY_PATH in DEFAULTS.LUA is not set!"
+          else
+              UIManager:show(InfoMessage:new{text = _("Fount calibre metadata at ") .. self.calibrefile .. _(". Save the default settings!")})
+          end
     else
         if string.sub(LIBRARY_PATH,string.len(LIBRARY_PATH)) ~= "/" then
             LIBRARY_PATH = LIBRARY_PATH .. "/"

From a51f8e8050de319f872b51ac0115a464f494a921 Mon Sep 17 00:00:00 2001
From: WS64 <ws64@hotmail.com>
Date: Mon, 11 Aug 2014 20:03:03 +0200
Subject: [PATCH 2/3] Update filemanagersetdefaults.lua

---
 .../filemanager/filemanagersetdefaults.lua    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua
index 89fff824f..9295b20f9 100644
--- a/frontend/apps/filemanager/filemanagersetdefaults.lua
+++ b/frontend/apps/filemanager/filemanagersetdefaults.lua
@@ -71,12 +71,17 @@ local function orderedPairs(t)
 end
 
 function SetDefaults:ConfirmEdit()
-    UIManager:show(ConfirmBox:new{
-        text = _("Wrong settings might crash Koreader! Continue?"),
-        ok_callback = function()
-            self:init()
-        end,
-    })
+    if not SetDefaults.EditConfirmed then
+        UIManager:show(ConfirmBox:new{
+            text = _("Wrong settings might crash Koreader! Continue?"),
+            ok_callback = function()
+                self.EditConfirmed = true
+                self:init()
+            end,
+        })
+    else
+        self:init()
+    end
 end
 
 function SetDefaults:init()
@@ -111,7 +116,6 @@ function SetDefaults:init()
         table.insert(self.results, {
            text = dummy,
            callback = function()
-
                GLOBAL_INPUT_VALUE = tostring(self.bools_value[i])
                self.set_dialog = InputDialog:new{
                    title = self.bools_name[i] .. ":",
@@ -123,6 +127,8 @@ function SetDefaults:init()
                                callback = function()
                                    _G[self.bools_name[i]] = settype(self.set_dialog:getInputText(),type(_G[self.bools_name[i]]))
                                    self:close()
+                                   self.defaults_menu:swithItemTable("Defaults", self.results)
+                                   UIManager:show(menu_container)
                                end,
                             },
                            {
@@ -130,6 +136,8 @@ function SetDefaults:init()
                                enabled = true,
                                callback = function()
                                    self:close()
+                                   self.defaults_menu:swithItemTable("Defaults", self.results)
+                                   UIManager:show(menu_container)
                                end,
                            },
                        },
@@ -248,6 +256,6 @@ function SetDefaults:SaveSettings()
         file:write(dpl[i] .. "\n")
     end
     file:close()
-    UIManager:show(InfoMessage:new{text = _("Default settings successfully saved to \"defaults.persistent.lua\"!")})
+    UIManager:show(InfoMessage:new{text = _("Default settings successfully saved!")})
 end
 return SetDefaults

From d81f6e7dd20d3db340d257c768e2d197eaa8e8d6 Mon Sep 17 00:00:00 2001
From: WS64 <ws64@hotmail.com>
Date: Mon, 11 Aug 2014 22:41:42 +0200
Subject: [PATCH 3/3] typo

---
 frontend/apps/filemanager/filemanagersearch.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/apps/filemanager/filemanagersearch.lua b/frontend/apps/filemanager/filemanagersearch.lua
index 392dd92bf..0ec0f56eb 100644
--- a/frontend/apps/filemanager/filemanagersearch.lua
+++ b/frontend/apps/filemanager/filemanagersearch.lua
@@ -74,7 +74,7 @@ function Search:init()
           if not self.calibrefile then
               error = "LIBRARY_PATH in DEFAULTS.LUA is not set!"
           else
-              UIManager:show(InfoMessage:new{text = _("Fount calibre metadata at ") .. self.calibrefile .. _(". Save the default settings!")})
+              UIManager:show(InfoMessage:new{text = _("Found calibre metadata at ") .. self.calibrefile .. _(". Save the default settings!")})
           end
     else
         if string.sub(LIBRARY_PATH,string.len(LIBRARY_PATH)) ~= "/" then