diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-07-08 12:12:00 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-07-08 12:12:00 -0400 |
| commit | 2d871ef9a9b5a5b6db5a6b51a64380a27aa2461f (patch) | |
| tree | acb6b919516268ce6678f126553219645644bba5 /src-qt5/core/lumina-desktop-unified/LSession.cpp | |
| parent | Split out the X11->Qt conversion function into it's own file (getting too lon... (diff) | |
| download | lumina-2d871ef9a9b5a5b6db5a6b51a64380a27aa2461f.tar.gz lumina-2d871ef9a9b5a5b6db5a6b51a64380a27aa2461f.tar.bz2 lumina-2d871ef9a9b5a5b6db5a6b51a64380a27aa2461f.zip | |
De-activate the volume reset on logout, and remove an old class/files from the Lumina2 project.
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/LSession.cpp')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/LSession.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp index 9c45b12c..2155a8b7 100644 --- a/src-qt5/core/lumina-desktop-unified/LSession.cpp +++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp @@ -27,6 +27,9 @@ LShortcutEvents* Lumina::SHORTCUTS = 0; LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lumina-desktop-unified"){ //Initialize the global objects to null pointers + qRegisterMetaType< Qt::Key >("Qt::Key"); + qRegisterMetaType< NativeWindow::Property >("NativeWindow::Property"); + mediaObj = 0; //private object used for playing login/logout chimes if(this->isPrimaryProcess()){ //Setup the global registrations @@ -187,7 +190,7 @@ void LSession::CleanupSession(){ //Create a temporary flag to prevent crash dialogs from opening during cleanup LUtils::writeFile("/tmp/.luminastopping",QStringList() << "yes", true); //Start the logout chimes (if necessary) - LOS::setAudioVolume( LOS::audioVolume() ); //make sure the audio volume is saved in the backend for the next login + //LOS::setAudioVolume( LOS::audioVolume() ); //make sure the audio volume is saved in the backend for the next login bool playaudio = DesktopSettings::instance()->value(DesktopSettings::Session,"PlayLogoutAudio",true).toBool(); if( playaudio ){ playAudioFile(LOS::LuminaShare()+"Logout.ogg"); } //Now perform any other cleanup |