summaryrefslogtreecommitdiffstats
path: root/kdm/kfrontend/kgreeter.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-11 15:14:55 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:52 +0200
commitb2dacef1e97dc3713a76a055eed24607fb7aa8de (patch)
tree125a233f08f5ffd3bdf7bd58e8d219241c2385ba /kdm/kfrontend/kgreeter.cpp
parenta8862198d193c7e70a897d83676da9c367562471 (diff)
downloadtdebase-b2dacef1e97dc3713a76a055eed24607fb7aa8de.tar.gz
tdebase-b2dacef1e97dc3713a76a055eed24607fb7aa8de.zip
Terminate kwin manager unless a TDE or failsafe session was selected
This closes Bug 824 (cherry picked from commit a305c0832688209d5359c212be92f54df9561ecc)
Diffstat (limited to 'kdm/kfrontend/kgreeter.cpp')
-rw-r--r--kdm/kfrontend/kgreeter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 5877cb6c7..07e9e3f70 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -842,10 +842,12 @@ KGreeter::verifyOk()
GSendInt( G_PutDmrc );
GSendStr( "Session" );
GSendStr( sessionTypes[curSel].type.utf8() );
+ curWMSession = sessionTypes[curSel].type.utf8();
} else if (!prevValid) {
GSendInt( G_PutDmrc );
GSendStr( "Session" );
GSendStr( "default" );
+ curWMSession = sessionTypes[curSel].type.utf8();
}
GSendInt( G_Ready );
closingDown = true;