aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/browser.cpp4
-rw-r--r--src/main.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/browser.cpp b/src/browser.cpp
index 82972dd..37071af 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -54,7 +54,9 @@ void Browser::setConfiguration(std::shared_ptr<Configuration> &config)
m_bookmarksManager = std::make_shared<BookmarksWidget>(QString::fromStdString(m_config->value<std::string>("bookmarks.path").value()));
m_downloadManager = std::make_shared<DownloadsWidget>(QString::fromStdString(m_config->value<std::string>("downloads.path").value()));
- m_urlRequestInterceptor = std::make_shared<UrlRequestInterceptor>(QString::fromStdString(m_config->value<std::string>("browser.filterPath").value()));
+
+ // TODO: change path
+ m_urlRequestInterceptor = std::make_shared<UrlRequestInterceptor>(QString::fromStdString(m_config->value<std::string>("browser.filterPath").value_or("")));
}
diff --git a/src/main.cpp b/src/main.cpp
index 837e06c..1707657 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -119,7 +119,6 @@ int main(int argc, char *argv[])
std::shared_ptr<Configuration> config = std::make_shared<Configuration>();
config->readDefaultConfiguration(readConfig(parser.value(defaultConfigOption)));
config->readUserConfiguration(parser.value(configOption).toStdString());
- instance.setConfiguration(config);
// check if first run
if(config->value<bool>("browser.firstRun").value() || parser.isSet(generateUserConfigOption)) {
@@ -141,6 +140,8 @@ int main(int argc, char *argv[])
}
}
+ instance.setConfiguration(config);
+
// TODO: instance check
instance.loadProfiles();