From 46d302854e12ca05fe1932590628203b56a894ee Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 12 Nov 2012 11:50:07 +0100 Subject: [PATCH] Avoid duplicate entries in QGenericUnixTheme::themeNames() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I6dc258274dc6614f56f306c30c95fe20c14fdf89 Reviewed-by: Friedemann Kleint Reviewed-by: Samuel Rødal --- src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index d219fbe..a39f26e 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -427,9 +427,9 @@ QStringList QGenericUnixTheme::themeNames() } else if (QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment() == QByteArray("GNOME")) { result.push_back(QLatin1String(QGnomeTheme::name)); } - const QByteArray session = qgetenv("DESKTOP_SESSION"); - if (!session.isEmpty() && session != "default") - result.push_back(QString::fromLocal8Bit(session)); + const QString session = QString::fromLocal8Bit(qgetenv("DESKTOP_SESSION")); + if (!session.isEmpty() && session != QStringLiteral("default") && !result.contains(session)) + result.push_back(session); } // desktopSettingsAware if (result.isEmpty()) result.push_back(QLatin1String(QGenericUnixTheme::name)); -- 2.7.4