diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-24 13:52:11 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-25 03:25:20 +0200 |
| commit | 9b1f3273e6fa37d395bde129c321bba3d4613034 (patch) | |
| tree | 459b71638101a4ea5af74818cd4aede6cf3a8802 /kdm | |
| parent | ce52491d41fc9d424e46f98681191a8107fd5ee0 (diff) | |
| download | tdebase-9b1f3273e6fa37d395bde129c321bba3d4613034.tar.gz tdebase-9b1f3273e6fa37d395bde129c321bba3d4613034.zip | |
Fix tdm greeter crash caused by invalid access to sessionTypes member
This resolves Bug 1449
(cherry picked from commit 93bbac1431bf40a313961444232111be541709e2)
Diffstat (limited to 'kdm')
| -rw-r--r-- | kdm/kfrontend/kgreeter.cpp | 10 |
1 files 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 |