Prevent tdm crash if window manager or compositor do not start

(cherry picked from commit 8a80c7f3df)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent e85de28ed2
commit 2873e76d92

@ -452,6 +452,7 @@ kg_main( const char *argv0 )
KGVerify::done(); KGVerify::done();
if (comp) { if (comp) {
if (comp->isRunning()) {
if (_compositor == "kompmgr") { if (_compositor == "kompmgr") {
// Change process UID // Change process UID
// Get user UID // Get user UID
@ -468,9 +469,11 @@ kg_main( const char *argv0 )
} }
comp->closeStdin(); comp->closeStdin();
comp->detach(); comp->detach();
}
delete comp; delete comp;
} }
if (kwin) { if (kwin) {
if (kwin->isRunning()) {
if (login_session_wm.endsWith("/startkde") || (login_session_wm == "failsafe")) { if (login_session_wm.endsWith("/startkde") || (login_session_wm == "failsafe")) {
kwin->closeStdin(); kwin->closeStdin();
kwin->detach(); kwin->detach();
@ -480,6 +483,7 @@ kg_main( const char *argv0 )
kwin->kill(); kwin->kill();
dcop->kill(); dcop->kill();
} }
}
delete kwin; delete kwin;
delete dcop; delete dcop;
} }

Loading…
Cancel
Save