From ab473de90a2d884c517f48f5921b9a82b1270aad Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Tue, 1 Mar 2011 01:52:37 +0100
Subject: [Fix] Startup problems with xsession (Quick&Dirty)

---
 src/xsession.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/xsession.cpp')

diff --git a/src/xsession.cpp b/src/xsession.cpp
index a888e91..37fad17 100644
--- a/src/xsession.cpp
+++ b/src/xsession.cpp
@@ -65,6 +65,8 @@ bool XSession::init(const QString& filename) {
     this->comment_ = comment;
     this->icon_ = icon;
 
+    _process = new QProcess();
+
     return true;
 }
 
@@ -99,16 +101,20 @@ QString XSession::icon() const {
 }
 
 bool XSession::run() const {
-    return QProcess::startDetached(this->exec_);
+    _process->start(this->exec_);
+    QObject::connect(_process, SIGNAL(finished(int, QProcess::ExitStatus)), QApplication::instance(), SLOT(quit()));
+    if (_process->state() == QProcess::Starting || QProcess::Running)
+        return true;
+    else
+        return false;
 }
 
 QList<Session*> XSession::readSessions(const QString& path) {
     QList<Session*> retval;
     foreach (QFileInfo fi, QDir(path).entryInfoList(QStringList("*.desktop"))) {
-        if (fi.baseName().compare("default.desktop") == 0) {
+        if (fi.baseName().compare("default") == 0) {
             continue;
         }
-
         XSession* session = new XSession;
         if (session->init(fi.absoluteFilePath())) {
             retval.append(session);
-- 
cgit v1.2.3-55-g7522