A large amount of cleanup:

1) Fix the screen-alignment in a number of screensavers
2) Fix the restart-interval for screensavers (60 seconds by default)
3) Fix the cleanup of old screensaver objects between rotations
4) Add a default settings file for screensavers
5) Fix the prioritization of the settings files within DesktopSettings.
6) Turn off some event filter debugging

1 files changed, 3 insertions, 1 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
index ff63e3a3..a0edde9f 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
@@ -110,7 +110,9 @@ void LScreenSaver::ShowScreenSaver(){
 
     //Setup the geometry of the base to match the screen
     BASES[i]->setGeometry(SCREENS[i]->geometry());  //match this screen geometry
-    BASES[i]->setPlugin(DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "screenplugin_"+SCREENS[i]->name(), DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "defaultscreenplugin","random").toString() ).toString() );
+    QString plug = DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "plugin_"+SCREENS[i]->name(), "").toString();
+    if(plug.isEmpty()){ plug = DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "default_plugin","random").toString();  }
+    BASES[i]->setPlugin(plug);
   }
   //Now set the overall parent widget geometry and show everything
   this->setGeometry(bounds); //overall background widget