diff options
| author | Weblate <noreply@weblate.org> | 2017-08-07 15:58:22 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-08-07 15:58:22 +0000 |
| commit | 1a320d85b86593fb7716eea493df39e339bbae77 (patch) | |
| tree | 33a44e00ac33f4c0d558e40e173472cb7ada624f /src-qt5/core/lumina-desktop/LSession.cpp | |
| parent | Translated using Weblate (French) (diff) | |
| parent | Translated using Weblate (Catalan) (diff) | |
| download | lumina-1a320d85b86593fb7716eea493df39e339bbae77.tar.gz lumina-1a320d85b86593fb7716eea493df39e339bbae77.tar.bz2 lumina-1a320d85b86593fb7716eea493df39e339bbae77.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop/LSession.cpp')
| -rw-r--r-- | src-qt5/core/lumina-desktop/LSession.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 93318b0f..777affd1 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -191,7 +191,10 @@ void LSession::CleanupSession(){ int vol = LOS::audioVolume(); if(vol>=0){ sessionsettings->setValue("last_session_state/audio_volume", vol); } bool playaudio = sessionsettings->value("PlayLogoutAudio",true).toBool(); - if( playaudio ){ playAudioFile(LOS::LuminaShare()+"Logout.ogg"); } + if( playaudio ){ + QString sfile = sessionsettings->value("audiofiles/logout", LOS::LuminaShare()+"Logout.ogg").toString(); + playAudioFile(sfile); + } //Stop the background system tray (detaching/closing apps as necessary) stopSystemTray(!cleansession); //Now perform any other cleanup @@ -296,7 +299,8 @@ void LSession::launchStartupApps(){ //Now play the login music since we are finished if(sessionsettings->value("PlayStartupAudio",true).toBool()){ - LSession::playAudioFile(LOS::LuminaShare()+"Login.ogg"); + QString sfile = sessionsettings->value("audiofiles/login", LOS::LuminaShare()+"Login.ogg").toString(); + playAudioFile(sfile); } qDebug() << "[DESKTOP INIT FINISHED]"; } |