From 6c4199b11a73c61b5ca2ed09fc54f1552631fc15 Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Sun, 1 Apr 2018 14:00:52 -0400
Subject: [PATCH] fix mainwindow icon

---
 src/gui/src/MainWindow.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index b92e5f7c..d874f99e 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -72,6 +72,8 @@ static const char* barrierIconFiles[] =
     ":/res/icons/16x16/barrier-transfering.png"
 };
 
+static const char* barrierLargeIcon = ":/res/icons/256x256/barrier.ico";
+
 MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
     m_Settings(settings),
     m_AppConfig(&appConfig),
@@ -104,7 +106,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
     setAttribute(Qt::WA_X11NetWmWindowTypeDialog, true);
 
     setupUi(this);
-
+    setWindowIcon(QIcon(barrierLargeIcon));
     createMenuBar();
     loadSettings();
     initConnections();
@@ -285,13 +287,8 @@ void MainWindow::saveSettings()
 
 void MainWindow::setIcon(qBarrierState state)
 {
-    QIcon icon;
-    icon.addFile(barrierIconFiles[state]);
-
-    setWindowIcon(icon);
-
     if (m_pTrayIcon)
-        m_pTrayIcon->setIcon(icon);
+        m_pTrayIcon->setIcon(QIcon(barrierIconFiles[state]));
 }
 
 void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)