From f1fce23e23d0a61ce588c5c089792a1e71dc0500 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 6 Sep 2018 17:59:57 -0400 Subject: Fix up the launching of the desktop session 1. Clear out the lockfiles for a session before launching it 2. Provide some mechanisms for returning lockfile paths without creating a new single-instance session. 3. A couple other random commits I still had staged on my laptop (settings menu tweak) --- src-qt5/core/lumina-session/lumina-session.pro | 1 + src-qt5/core/lumina-session/session.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src-qt5/core/lumina-session') diff --git a/src-qt5/core/lumina-session/lumina-session.pro b/src-qt5/core/lumina-session/lumina-session.pro index 9d8e8f87..dee736cf 100644 --- a/src-qt5/core/lumina-session/lumina-session.pro +++ b/src-qt5/core/lumina-session/lumina-session.pro @@ -9,6 +9,7 @@ target.path = $${L_BINDIR} include(../libLumina/LDesktopUtils.pri) include(../libLumina/LuminaXDG.pri) include(../libLumina/LuminaThemes.pri) +include(../libLumina/LuminaSingleApplication.pri) SOURCES += main.cpp \ session.cpp diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 0988e7ea..c4337c8e 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -16,6 +16,7 @@ #include #include #include +#include void LSession::stopall(){ stopping = true; @@ -193,13 +194,15 @@ void LSession::start(bool unified){ startProcess("wm", WM); } //Desktop Next - startProcess("runtime","lumina-desktop -new-instance"); + LSingleApplication::removeLocks("lumina-desktop"); + startProcess("runtime","lumina-desktop"); //ScreenSaver if(LUtils::isValidBinary("xscreensaver")){ startProcess("screensaver","xscreensaver -no-splash"); } }else{ //unified process setupCompositor(true); //required for Lumina 2 - startProcess("runtime","lumina-desktop-unified -new-instance"); + LSingleApplication::removeLocks("lumina-desktop-unified"); + startProcess("runtime","lumina-desktop-unified"); } } -- cgit