diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-08-02 11:30:36 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-08-02 11:30:53 -0400 |
| commit | f03f72324ff70af5285c50632df4148a6881fa46 (patch) | |
| tree | 956735723bbe2062b9ada9fb60c0d9e291525132 /src-qt5/core/lumina-desktop-unified | |
| parent | Merge branch 'master' of http://github.com/trueos/lumina (diff) | |
| download | lumina-f03f72324ff70af5285c50632df4148a6881fa46.tar.gz lumina-f03f72324ff70af5285c50632df4148a6881fa46.tar.bz2 lumina-f03f72324ff70af5285c50632df4148a6881fa46.zip | |
Adjust the screensaver restart routine a bit.
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp | 1 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp | 3 |
2 files changed, 2 insertions, 2 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 0ac8aaeb..2c36af80 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp @@ -109,6 +109,7 @@ void LScreenSaver::ShowScreenSaver(){ if(DEBUG){ qDebug() << " - New SS Base:" << i; } BASES << new SSBaseWidget(this, settings); connect(BASES[i], SIGNAL(InputDetected()), this, SLOT(newInputEvent()) ); + //Setup the geometry of the base to match the screen BASES[i]->setGeometry(SCREENS[i]->geometry()); //match this screen geometry BASES[i]->setPlugin(settings->value("screenplugin"+QString::number(i+1), settings->value("defaultscreenplugin","random").toString() ).toString() ); diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp index 9ef0c491..7854b597 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp @@ -39,8 +39,7 @@ void SSBaseWidget::startPainting(){ cplug = plugType; //free up any old animation instance if(ANIM!=0){ - ANIM->stop(); ANIM->clear(); - delete ANIM; ANIM = 0; + stopPainting(); } //If a random plugin - grab one of the known plugins if(cplug=="random"){ |