From 9b1f3273e6fa37d395bde129c321bba3d4613034 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 24 Apr 2013 13:52:11 -0500
Subject: Fix tdm greeter crash caused by invalid access to sessionTypes member
 This resolves Bug 1449 (cherry picked from commit
 93bbac1431bf40a313961444232111be541709e2)

---
 kdm/kfrontend/kgreeter.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index d0a2afeed..6a236ef81 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -718,10 +718,12 @@ void // private
 KGreeter::setPrevWM( int wm )
 {
 	if (curPrev != wm) {
-		if (curPrev != -1)
+		if (curPrev != -1) {
 			sessMenu->changeItem( curPrev, sessionTypes[curPrev].name );
-		if (wm != -1)
+		}
+		if (wm != -1) {
 			sessMenu->changeItem( wm, sessionTypes[wm].name + i18n(" (previous)") );
+		}
 		curPrev = wm;
 	}
 }
@@ -857,7 +859,6 @@ KGreeter::verifyOk()
 		GSendInt( G_PutDmrc );
 		GSendStr( "Session" );
 		GSendStr( "default" );
-		curWMSession = sessionTypes[curSel].type.utf8();
 	}
 	GSendInt( G_Ready );
 	closingDown = true;
@@ -867,8 +868,9 @@ KGreeter::verifyOk()
 void
 KGreeter::verifyFailed()
 {
-	if (needLoad)
+	if (needLoad) {
 		slotLoadPrevWM();
+	}
 }
 
 void
-- 
cgit v1.2.1