|
|
@ -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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|