From eabb12ff276376cfa3bb82cfa878584db405e006 Mon Sep 17 00:00:00 2001 From: sgourdas Date: Fri, 13 Sep 2024 16:41:28 +0300 Subject: [PATCH] Monitor data directory on portable mode --- src/settingsmanager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/settingsmanager.cpp b/src/settingsmanager.cpp index 86870a9..27006b6 100644 --- a/src/settingsmanager.cpp +++ b/src/settingsmanager.cpp @@ -186,12 +186,15 @@ void SettingsManager::setContentType(FilterList contentTypeList) void SettingsManager::initSettings() { + if(isPortableMode()) { + m_downloadDir = m_monitorDir = getDataDirectory(); + } else { + m_downloadDir = m_settings.value("download/dir", getDataDirectory()).toString(); + m_monitorDir = m_settings.value("monitor/dir", QString("")).toString(); + } m_kiwixServerPort = m_settings.value("localKiwixServer/port", 8080).toInt(); m_zoomFactor = m_settings.value("view/zoomFactor", 1).toDouble(); - QString dataDir = getDataDirectory(); - m_downloadDir = isPortableMode() ? dataDir : m_settings.value("download/dir", dataDir).toString(); m_kiwixServerIpAddress = m_settings.value("localKiwixServer/ipAddress", QString("0.0.0.0")).toString(); - m_monitorDir = m_settings.value("monitor/dir", QString("")).toString(); m_moveToTrash = m_settings.value("moveToTrash", true).toBool(); m_reopenTab = m_settings.value("reopenTab", false).toBool(); QString defaultLang = QLocale::languageToString(QLocale().language()) + '|' + QLocale().name().split("_").at(0);