Fix tdm greeter crash caused by invalid access to sessionTypes member

This resolves Bug 1449
pull/2/head
Timothy Pearson 13 years ago
parent 9e04189c58
commit 93bbac1431

@ -655,10 +655,12 @@ void // private
KGreeter::setPrevWM( int wm ) KGreeter::setPrevWM( int wm )
{ {
if (curPrev != wm) { if (curPrev != wm) {
if (curPrev != -1) if (curPrev != -1) {
sessMenu->changeItem( curPrev, sessionTypes[curPrev].name ); sessMenu->changeItem( curPrev, sessionTypes[curPrev].name );
if (wm != -1) }
if (wm != -1) {
sessMenu->changeItem( wm, sessionTypes[wm].name + i18n(" (previous)") ); sessMenu->changeItem( wm, sessionTypes[wm].name + i18n(" (previous)") );
}
curPrev = wm; curPrev = wm;
} }
} }
@ -794,7 +796,6 @@ KGreeter::verifyOk()
GSendInt( G_PutDmrc ); GSendInt( G_PutDmrc );
GSendStr( "Session" ); GSendStr( "Session" );
GSendStr( "default" ); GSendStr( "default" );
curWMSession = sessionTypes[curSel].type.utf8();
} }
GSendInt( G_Ready ); GSendInt( G_Ready );
closingDown = true; closingDown = true;
@ -804,8 +805,9 @@ KGreeter::verifyOk()
void void
KGreeter::verifyFailed() KGreeter::verifyFailed()
{ {
if (needLoad) if (needLoad) {
slotLoadPrevWM(); slotLoadPrevWM();
}
} }
void void

Loading…
Cancel
Save