From 4fc5959f71e72e3f0d8747efbe454757e0e77b2b Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Tue, 21 Feb 2017 22:57:30 +0100
Subject: [PATCH] Fix Mac OS X crash issue, License file updated

---
 LICENSE           | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 UserInterface.cpp | 13 ++++++++++++
 UserInterface.ui  |  8 -------
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/LICENSE b/LICENSE
index 94a0453..9cecc1d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -619,3 +619,56 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/UserInterface.cpp b/UserInterface.cpp
index 385892a..c1d67d0 100755
--- a/UserInterface.cpp
+++ b/UserInterface.cpp
@@ -30,6 +30,7 @@
 #include "IconLoader.h"
 #include "AppEnv.h"
 #include "config.h"
+#include <QtGlobal>
 #include <QStyleFactory>
 #include <QFileDialog>
 #include <QHBoxLayout>
@@ -65,6 +66,18 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
     {
         ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
     }
+    if (QIcon::hasThemeIcon("preferences-system"))
+    {
+#ifndef Q_WS_MAC // Setting icon for preferences/settings/options lead to a crash in Mac OS X
+        ui->actionOptions->setIcon(QIcon::fromTheme("preferences-system"));
+#endif
+    }
+    if (QIcon::hasThemeIcon("application-exit"))
+    {
+#ifndef Q_WS_MAC // Setting icon for exit/quit lead to a crash in Mac OS X
+        ui->actionExit->setIcon(QIcon::fromTheme("application-exit"));
+#endif
+    }
 }
 
 void UserInterface::setupDirEnv()
diff --git a/UserInterface.ui b/UserInterface.ui
index 4f4f6bf..5a34fce 100755
--- a/UserInterface.ui
+++ b/UserInterface.ui
@@ -224,10 +224,6 @@
    </property>
   </action>
   <action name="actionExit">
-   <property name="icon">
-    <iconset theme="application-exit">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>&amp;Exit</string>
    </property>
@@ -247,10 +243,6 @@
    </property>
   </action>
   <action name="actionOptions">
-   <property name="icon">
-    <iconset theme="preferences-system">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>&amp;Settings</string>
    </property>