diff options
author | Ken Moore <ken@pcbsd.org> | 2015-04-28 11:11:48 -0400 |
---|---|---|
committer | Ken Moore <ken@pcbsd.org> | 2015-04-28 11:11:48 -0400 |
commit | e07dfbbf8638eab840e5a8c942cf300ecc3a657e (patch) | |
tree | eea7c1fd527fd7443c2a205bfd8a1dcb83d746c4 | |
parent | Tag version 0.8.4-Release in preparation for branching. (diff) | |
download | lumina-e07dfbbf8638eab840e5a8c942cf300ecc3a657e.tar.gz lumina-e07dfbbf8638eab840e5a8c942cf300ecc3a657e.tar.bz2 lumina-e07dfbbf8638eab840e5a8c942cf300ecc3a657e.zip |
Move the timer to launch the startup applications into the session itself (instead of main.cpp). This should prevent the random occasions when that timer never seems to go off.
-rw-r--r-- | lumina-desktop/LSession.cpp | 1 | ||||
-rw-r--r-- | lumina-desktop/main.cpp | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 9fbd01bf..59df5c44 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -131,6 +131,7 @@ void LSession::setupSession(){ connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherChange(QString)) ); connect(this, SIGNAL(aboutToQuit()), this, SLOT(SessionEnding()) ); if(DEBUG){ qDebug() << " - Init Finished:" << timer->elapsed(); delete timer;} + QTimer::singleShot(3000, this, SLOT(launchStartupApps()) ); //startup these processes in 3 seconds } void LSession::CleanupSession(){ diff --git a/lumina-desktop/main.cpp b/lumina-desktop/main.cpp index adf96181..602ff2ec 100644 --- a/lumina-desktop/main.cpp +++ b/lumina-desktop/main.cpp @@ -80,17 +80,15 @@ int main(int argc, char ** argv) //Startup the Application if(DEBUG){ qDebug() << "Session Init:" << timer->elapsed(); } LSession a(argc, argv); - if(DEBUG){ qDebug() << "Theme Init:" << timer->elapsed(); } - LuminaThemeEngine theme(&a); //Setup Log File qInstallMessageHandler(MessageOutput); - if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); } - a.setupSession(); + if(DEBUG){ qDebug() << "Theme Init:" << timer->elapsed(); } + LuminaThemeEngine theme(&a); if(DEBUG){ qDebug() << "Load Locale:" << timer->elapsed(); } LUtils::LoadTranslation(&a, "lumina-desktop"); - //a.LoadLocale(QLocale().name()); - //Start launching external applications - QTimer::singleShot(3000, &a, SLOT(launchStartupApps()) ); //wait a couple seconds first + if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); } + a.setupSession(); + if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;} int retCode = a.exec(); //qDebug() << "Stopping the window manager"; |