diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-24 13:52:11 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-24 13:52:11 -0500 |
| commit | 93bbac1431bf40a313961444232111be541709e2 (patch) | |
| tree | 1526a84bef5505a147298f66ecff137f7566f0a9 /tdm | |
| parent | 9e04189c586c7fc98097b0a42222d99621131c58 (diff) | |
| download | tdebase-93bbac1431bf40a313961444232111be541709e2.tar.gz tdebase-93bbac1431bf40a313961444232111be541709e2.zip | |
Fix tdm greeter crash caused by invalid access to sessionTypes member
This resolves Bug 1449
Diffstat (limited to 'tdm')
| -rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 9bcf60eb5..0a71eddad 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -655,10 +655,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; } } @@ -794,7 +796,6 @@ KGreeter::verifyOk() GSendInt( G_PutDmrc ); GSendStr( "Session" ); GSendStr( "default" ); - curWMSession = sessionTypes[curSel].type.utf8(); } GSendInt( G_Ready ); closingDown = true; @@ -804,8 +805,9 @@ KGreeter::verifyOk() void KGreeter::verifyFailed() { - if (needLoad) + if (needLoad) { slotLoadPrevWM(); + } } void |