[Libreoffice-commits] core.git: vcl/unx
Miklos Vajna
vmiklos at collabora.co.uk
Fri Nov 13 05:24:42 PST 2015
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8f6ecf15644b641f729c24822fcb6bb29617ef57
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Nov 13 14:22:30 2015 +0100
tdf#95795 vcl: fix KDE5 desktop detection
Regression from commit 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (new
loplugin: oncevar, 2015-11-06), KDE4 was detected as KDE5.
Change-Id: If4a7a074052a31c7505f53c03a36a0975d71b3a7
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 3c8f8bf..8135164 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -271,7 +271,7 @@ static bool is_kde5_desktop( Display* pDisplay )
{
static const char * pFullVersion = getenv( "KDE_FULL_SESSION" );
static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" );
- if ( pFullVersion && pSessionVersion && strcmp(pSessionVersion, "5") )
+ if ( pFullVersion && pSessionVersion && strcmp(pSessionVersion, "5") == 0)
return true;
if ( KDEVersion( pDisplay ) == 5 )
More information about the Libreoffice-commits
mailing list