From dfba135f101f33cef438aee66e604de4095a229d Mon Sep 17 00:00:00 2001 From: robert00s Date: Wed, 9 Aug 2017 18:57:22 +0200 Subject: [PATCH] Fix: Advanced settings crashes --- frontend/apps/filemanager/filemanagersetdefaults.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua index 931a72d4f..3cce9c966 100644 --- a/frontend/apps/filemanager/filemanagersetdefaults.lua +++ b/frontend/apps/filemanager/filemanagersetdefaults.lua @@ -9,13 +9,21 @@ local Menu = require("ui/widget/menu") local MultiInputDialog = require("ui/widget/multiinputdialog") local UIManager = require("ui/uimanager") local dump = require("dump") +local isAndroid, android = pcall(require, "android") local util = require("ffi/util") local _ = require("gettext") local Screen = require("device").screen -local defaults_path = DataStorage:getDataDir() .. "/defaults.lua" -local persistent_defaults_path = DataStorage:getDataDir() .. "/defaults.persistent.lua" +local function getDefaultsPath() + local defaults_path = DataStorage:getDataDir() .. "/defaults.lua" + if isAndroid then + defaults_path = android.dir .. "/defaults.lua" + end + return defaults_path +end +local defaults_path = getDefaultsPath() +local persistent_defaults_path = DataStorage:getDataDir() .. "/defaults.persistent.lua" local SetDefaults = InputContainer:new{ defaults_name = {},