diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-01-28 14:28:20 -0500 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-01-28 14:28:20 -0500 |
| commit | 3897fc23104f2dd697313ea96c82fcec12adccd9 (patch) | |
| tree | 428c07bc069b68cb42e2f014be195f4f5d3715ef /lumina-desktop/LSession.cpp | |
| parent | Add knowledge of the lumina-info utility to the Lumina desktop (userbutton, c... (diff) | |
| parent | string change in LuminaOS-Debian / qt5ct instead of qtconfig (diff) | |
| download | lumina-3897fc23104f2dd697313ea96c82fcec12adccd9.tar.gz lumina-3897fc23104f2dd697313ea96c82fcec12adccd9.tar.bz2 lumina-3897fc23104f2dd697313ea96c82fcec12adccd9.zip | |
Merge pull request #44 from Nanolx/lumina-misc
LuminaOS-Debian #4
Diffstat (limited to 'lumina-desktop/LSession.cpp')
| -rw-r--r-- | lumina-desktop/LSession.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 96184c84..34ca9eec 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -144,12 +144,16 @@ void LSession::setupSession(){ void LSession::launchStartupApps(){ //First start any system-defined startups, then do user defined qDebug() << "Launching startup applications"; - for(int i=0; i<2; i++){ - QString startfile; - if(i==0){startfile = LOS::LuminaShare()+"startapps"; } - else{ startfile = QDir::homePath()+"/.lumina/startapps"; } - if(!QFile::exists(startfile)){ continue; } //go to the next + QString startfile; + if(QFile::exists("/etc/luminaStartapps")) { + startfile = "/etc/luminaStartapps"; + } else if (QFile::exists(QDir::homePath()+"/.lumina/startapps")) { + startfile = QDir::homePath()+"/.lumina/startapps"; + } else if (QFile::exists(LOS::LuminaShare()+"startapps")) { + startfile = LOS::LuminaShare()+"startapps"; + } + if(!startfile.isEmpty()) { QFile file(startfile); if( file.open(QIODevice::ReadOnly | QIODevice::Text) ){ QTextStream in(&file); @@ -163,6 +167,7 @@ void LSession::launchStartupApps(){ file.close(); } } + //Now play the login music if(sessionsettings->value("PlayStartupAudio",true).toBool()){ LSession::playAudioFile(LOS::LuminaShare()+"Login.ogg"); |