diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-12-14 10:53:36 +0100 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-12-14 10:53:36 +0100 |
commit | 72bb0de942e23b0940d138b79dc73f5b49a8967e (patch) | |
tree | 4b852d375a07ee4c3571dbdc014a009b65ea15cc /src | |
parent | Fixed getCompiler build failure with gcc (diff) | |
download | smolbote-72bb0de942e23b0940d138b79dc73f5b49a8967e.tar.xz |
Fixed crash on startup due to missing browser.filterPath
Diffstat (limited to 'src')
-rw-r--r-- | src/browser.cpp | 4 | ||||
-rw-r--r-- | src/main.cpp | 3 |
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(); |