Merge pull request #1767 from badshah400/issue1746

Prepend iconsDark path after setting default path.
6 years ago · 9df451a952
parent 46a4dc8292 7ce65c8377
commit 9df451a952
1 changed files with 3 additions and 3 deletions
--- a/src/control/XournalMain.cpp
+++ b/src/control/XournalMain.cpp
@ -319,14 +319,14 @@ auto XournalMain::run(int argc, char* argv[]) -> int {

    auto* control = new Control(gladePath);

+    string icon = gladePath->getFirstSearchPath() + "/icons/";
+    gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), icon.c_str());
+
    if (control->getSettings()->isDarkTheme()) {
        string icon = gladePath->getFirstSearchPath() + "/iconsDark/";
        gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), icon.c_str());
    }

-    string icon = gladePath->getFirstSearchPath() + "/icons/";
-    gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), icon.c_str());
-
    auto* win = new MainWindow(gladePath, control);
    control->initWindow(win);