From 78ba3875d91d23e7eee52ccc336ab1003f1fc9db Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 7 Apr 2014 09:30:42 +0200
Subject: [PATCH] [IconTheme] Fixed setting fallback icon theme

Closes #1274

[ci skip]
---
 src/lib/app/mainapplication.cpp |  6 ++++++
 src/main/main.cpp               | 12 +++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index 6eea6690d..a3fe5c92c 100644
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@@ -110,6 +110,12 @@ MainApplication::MainApplication(int &argc, char** argv)
     setOrganizationDomain(QLatin1String("qupzilla"));
     setWindowIcon(QIcon(QLatin1String(":icons/exeicons/qupzilla-window.png")));
 
+    // Set fallback icon theme (eg. on Windows/Mac)
+    if (QIcon::fromTheme(QSL("view-refresh")).isNull()) {
+        QIcon::setThemeSearchPaths(QStringList() << QL1S(":/oxygen-fallback"));
+        QIcon::setThemeName(QSL("oxygen-fallback"));
+    }
+
     QUrl startUrl;
     QString startProfile;
     QStringList messages;
diff --git a/src/main/main.cpp b/src/main/main.cpp
index bf27f9a20..b760e033f 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -159,24 +159,18 @@ int main(int argc, char* argv[])
 #endif
 
 #if defined(QZ_WS_X11) && QT_VERSION < 0x050000
-    QApplication::setGraphicsSystem("raster"); // Better overall performance on X11
+    // Better overall performance on X11
+    QApplication::setGraphicsSystem(QSL("raster"));
 #endif
 
 #if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
     signal(SIGSEGV, qupzilla_signal_handler);
 #endif
 
-    // Set fallback icon theme (eg. on Windows/Mac)
-    if (QIcon::fromTheme(QSL("document-open")).isNull()) {
-        QIcon::setThemeSearchPaths(QStringList() << QL1S(":/oxygen-fallback"));
-        QIcon::setThemeName(QSL("oxygen-fallback"));
-    }
-
     MainApplication app(argc, argv);
 
-    if (app.isClosing()) {
+    if (app.isClosing())
         return 0;
-    }
 
     app.setProxyStyle(new ProxyStyle);