Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: do not lock when starting kdeinit4

Browse source 
kdeinit4 shuts down client and restarts itself

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-24 02:40:12 +03:00
parent fd0befa582
commit a8cab586ec
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
kdecore/kernel/ktoolinvocation.cpp
View file

@ -27,10 +27,7 @@
#include "kurl.h"
#include "kmessage.h"
#include "kservice.h"
#include <klockfile.h>
#include <klocale.h>
#include <errno.h>
#include "klocale.h"
#include <QtCore/QThread>
#include <QtCore/QProcess>
@ -38,6 +35,8 @@
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusConnectionInterface>
#include <errno.h>
KToolInvocation *KToolInvocation::self()
{
K_GLOBAL_STATIC(KToolInvocation, s_self)
@ -59,7 +58,16 @@ org::kde::KLauncher *KToolInvocation::klauncher()
{
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(QString::fromLatin1("org.kde.klauncher"))) {
kDebug(180) << "klauncher not running... launching kdeinit";
KToolInvocation::startKdeinit();
// Try to launch kdeinit.
QString srv = KStandardDirs::findExe(QLatin1String("kdeinit4"));
if (srv.isEmpty()) {
kError() << "kdeinit4 not available";
// NOTE: this will crash any users not checking the pointer
return nullptr;
}
QStringList args;
args += QString::fromLatin1("--suicide");
QProcess::execute(srv, args);
}
return ::klauncherIface();
}
@ -302,28 +310,4 @@ void KToolInvocation::invokeMailer(const KUrl &mailtoURL, const QByteArray& star
invokeMailer( address, cc, bcc, subject, body, QString(), attachURLs, startup_id );
}
void KToolInvocation::startKdeinit()
{
KComponentData inst( "startkdeinitlock" );
KLockFile lock( KStandardDirs::locateLocal("tmp", QString::fromLatin1("startkdeinitlock"), inst ));
if( lock.lock( KLockFile::NoBlockFlag ) != KLockFile::LockOK ) {
lock.lock();
if( QDBusConnection::sessionBus().interface()->isServiceRegistered(QString::fromLatin1("org.kde.klauncher")))
return; // whoever held the lock has already started it
}
// Try to launch kdeinit.
QString srv = KStandardDirs::findExe(QLatin1String("kdeinit4"));
if (srv.isEmpty())
return;
// this is disabled because we are in kdecore
// const bool gui = qApp && qApp->type() != QApplication::Tty;
// if ( gui )
// qApp->setOverrideCursor( Qt::WaitCursor );
QStringList args;
args += QString::fromLatin1("--suicide");
QProcess::execute(srv, args);
// if ( gui )
// qApp->restoreOverrideCursor();
}
#include "moc_ktoolinvocation.cpp"