diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-08-23 09:33:53 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-08-23 09:33:53 -0400 |
| commit | 652c06e90dd6851401c9fdf1a083ac66debfb71a (patch) | |
| tree | 46992742e17c593aeefa2ee2fd38ec2ae52d68b9 /src-qt5/core-utils | |
| parent | Couple minor changes to the OS-detect.pri (diff) | |
| parent | Fix a list which was not getting populated properly. (diff) | |
| download | lumina-652c06e90dd6851401c9fdf1a083ac66debfb71a.tar.gz lumina-652c06e90dd6851401c9fdf1a083ac66debfb71a.tar.bz2 lumina-652c06e90dd6851401c9fdf1a083ac66debfb71a.zip | |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core-utils')
| -rw-r--r-- | src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp index f962f7d7..3c0edc76 100644 --- a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp +++ b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.cpp @@ -91,6 +91,7 @@ QList<ScreenInfo> RRSettings::PreviousSettings(QString profile){ QStringList avail; for(int i=0; i<screens.length(); i++){ if(devs.contains(screens[i].ID) && screens[i].isavailable){ //only load settings for monitors which are currently attached + avail << screens[i].ID; //currently available set.beginGroup(screens[i].ID); screens[i].geom = set.value("geometry", QRect()).toRect(); screens[i].isprimary = set.value("isprimary", false).toBool(); @@ -114,7 +115,7 @@ QList<ScreenInfo> RRSettings::PreviousSettings(QString profile){ QStringList filter = avail.filter(priority[i]); if(!filter.isEmpty()){ filter.sort(); primary = filter.first(); } } - if(primary.isEmpty()){ primary = avail.first(); } + if(primary.isEmpty() && !avail.isEmpty()){ primary = avail.first(); } } //Ensure only one monitor is primary, and reset a few flags for(int i=0; i<screens.length(); i++){ |