From f0d099b62cfdd0dc283afe271fd01b7d94c49ea8 Mon Sep 17 00:00:00 2001
From: Robert <robert.styla@gmail.com>
Date: Tue, 18 Sep 2018 21:23:50 +0200
Subject: [PATCH] calibre companion plugin: misc changes  (#4214)

---
 plugins/calibrecompanion.koplugin/main.lua | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/calibrecompanion.koplugin/main.lua b/plugins/calibrecompanion.koplugin/main.lua
index 9abb5a180..028e75d31 100644
--- a/plugins/calibrecompanion.koplugin/main.lua
+++ b/plugins/calibrecompanion.koplugin/main.lua
@@ -86,9 +86,11 @@ function CalibreCompanion:addToMainMenu(menu_items)
         sub_item_table = {
             {
                 text_func = function()
-                    return not self.calibre_socket
-                        and _("Connect")
-                        or _("Disconnect")
+                    if self.calibre_socket then
+                        return _("Disconnect")
+                    else
+                        return _("Connect")
+                    end
                 end,
                 callback = function()
                     if not self.calibre_socket then
@@ -98,6 +100,12 @@ function CalibreCompanion:addToMainMenu(menu_items)
                     end
                 end
             },
+            {
+                text = _("Set inbox directory"),
+                callback = function()
+                    CalibreCompanion:setInboxDir()
+                end
+            }
         }
     }
 end
@@ -126,11 +134,12 @@ end
 function CalibreCompanion:setInboxDir(host, port)
     local calibre_device = self
     require("ui/downloadmgr"):new{
-        title = _("Choose inbox by long-pressing"),
         onConfirm = function(inbox)
             DEBUG("set inbox directory", inbox)
             G_reader_settings:saveSetting("inbox_dir", inbox)
-            calibre_device:initCalibreMQ(host, port)
+            if host and port then
+                calibre_device:initCalibreMQ(host, port)
+            end
         end,
     }:chooseDir()
 end