[Pkg-owncloud-commits] [owncloud-client] 18/121: Update accountsettings.cpp

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit ebc44fa4943bc032f46a586a7f39f834d37d88fd
Author: Jürgen Weigert <jnweiger at gmail.com>
Date:   Tue Jun 7 14:21:50 2016 +0200

    Update accountsettings.cpp
---
 src/gui/accountsettings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 151f7b8..69028ef 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -161,11 +161,11 @@ void AccountSettings::slotOpenAccountWizard()
 {
     if (
 #if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
-            qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5"
+            qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" ||
                 // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
                 // (issue #4693, #4944)
 #endif
-            || QSystemTrayIcon::isSystemTrayAvailable()) {
+            QSystemTrayIcon::isSystemTrayAvailable()) {
         topLevelWidget()->close();
     }
 #ifdef Q_OS_MAC

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git