aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop-unified/LSession.cpp
diff options
context:
space:
mode:
authorZackaryWelch <welch.zackary@gmail.com>2018-01-30 13:25:00 -0500
committerZackaryWelch <welch.zackary@gmail.com>2018-01-30 13:25:00 -0500
commit79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78 (patch)
treea3df677962ce5eeeef5ac3b9056119987b701c8b /src-qt5/core/lumina-desktop-unified/LSession.cpp
parentFixed the find/bookmark widgets and rotation for lumina-pdf (diff)
parentMerge branch 'master' of github.com:trueos/lumina (diff)
downloadlumina-79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78.tar.gz
lumina-79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78.tar.bz2
lumina-79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78.zip
Merge branch 'master' of https://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/LSession.cpp')
-rw-r--r--src-qt5/core/lumina-desktop-unified/LSession.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index dcd1688f..1c103fab 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -31,7 +31,6 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
qRegisterMetaType< NativeWindowSystem::MouseButton >("NativeWindowSystem::MouseButton");
mediaObj = 0; //private object used for playing login/logout chimes
- OSThread = 0;
if(this->isPrimaryProcess()){
//Setup the global registrations
qsrand(QDateTime::currentMSecsSinceEpoch());
@@ -58,9 +57,6 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
Lumina::APPLIST = XDGDesktopList::instance();
Lumina::ROOTWIN = new RootWindow();
Lumina::SHORTCUTS = new LShortcutEvents(); //this can be moved to it's own thread eventually as well
- OSThread = new QThread();
- OSInterface::instance()->moveToThread(OSThread);
- OSThread->start();
setupGlobalConnections();
} //end check for primary process
}
@@ -80,10 +76,6 @@ LSession::~LSession(){
if(Lumina::DESKMAN!=0){ Lumina::DESKMAN->deleteLater(); }
if(OSInterface::instance()->isRunning()){ OSInterface::instance()->stop(); }
OSInterface::instance()->deleteLater();
- if(OSThread!=0){
- if(OSThread->isRunning()){ OSThread->quit(); }
- OSThread->deleteLater();
- }
}
void LSession::setupSession(){
@@ -117,7 +109,7 @@ void LSession::setupSession(){
//checkUserFiles(); //adds these files to the watcher as well
Lumina::NWS->setRoot_numberOfWorkspaces(QStringList() << "one" << "two");
Lumina::NWS->setRoot_currentWorkspace(0);
- if(!OSInterface::instance()->isRunning()){ OSInterface::instance()->start(); }
+ OSInterface::instance()->start();
Lumina::DESKMAN->start();
Lumina::ROOTWIN->start();
bgstack15