Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ksmserver: use KSMServer::isWM() to check if session command is window manager command

Browse source 
fixes window manager session restoration, for reference:
c920743903

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-19 15:12:51 +03:00
parent ee10c1a6c3
commit 1091d4d98c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ksmserver/startup.cpp
View file

@ -103,7 +103,7 @@ void KSMServer::restoreSession( const QString &sessionName )
if ( !wm.isEmpty() ) {
for ( int i = 1; i <= count; i++ ) {
QString n = QString::number(i);
if ( wm == configSessionGroup.readEntry( QString("program")+n, QString() ) ) {
if ( isWM( configSessionGroup.readEntry( QString("program")+n, QString() ) ) ) {
wmStartCommands << configSessionGroup.readEntry( QString("restartCommand")+n, QStringList() );
}
}
@ -310,7 +310,7 @@ void KSMServer::tryRestoreNext()
(config.readEntry( QString("restartStyleHint")+n, 0 ) == SmRestartNever)) {
continue;
}
if ( wm == config.readEntry( QString("program")+n, QString() ) )
if ( isWM( config.readEntry( QString("program")+n, QString() ) ) )
continue; // wm already started
if( config.readEntry( QString( "wasWm" )+n, false ))
continue; // it was wm before, but not now, don't run it (some have --replace in command :( )