From 3156b910d9e5250170fd01c3e4234cf585c45f3f Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 13 Aug 2011 03:58:08 +0000
Subject: Fix kdm startup when compositor is not enabled

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246838 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdm/kfrontend/kgapp.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kdm/kfrontend/kgapp.cpp')

diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index 7c158bc42..b57b4371d 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -176,18 +176,18 @@ kg_main( const char *argv0 )
 	XSetErrorHandler( ignoreXError );
 	argb_visual_available = false;
 	char *display = 0;
-	
+
 	Display *dpyi = XOpenDisplay( display );
 	if ( !dpyi ) {
 		kdError() << "cannot connect to X server " << display << endl;
 		exit( 1 );
 	}
-	
+
 	int screen = DefaultScreen( dpyi );
 	Colormap colormap = 0;
 	Visual *visual = 0;
 	int event_base, error_base;
-	
+
 	if ( XRenderQueryExtension( dpyi, &event_base, &error_base ) ) {
 		int nvi;
 		XVisualInfo templ;
@@ -196,7 +196,7 @@ kg_main( const char *argv0 )
 		templ.c_class = TrueColor;
 		XVisualInfo *xvi = XGetVisualInfo( dpyi, VisualScreenMask | VisualDepthMask
 				| VisualClassMask, &templ, &nvi );
-		
+
 		for ( int i = 0; i < nvi; i++ ) {
 			XRenderPictFormat *format = XRenderFindVisualFormat( dpyi, xvi[i].visual );
 			if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
@@ -211,7 +211,7 @@ kg_main( const char *argv0 )
 	XSetErrorHandler( (XErrorHandler)0 );
 
 	GreeterApp *app;
-	if( argb_visual_available ) {
+	if ( (argb_visual_available == true) && (!_compositor.isEmpty()) ) {
 		app = new GreeterApp(dpyi);
 	}
 	else {
-- 
cgit v1.2.3