yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ScreenshotEffect: fix ordering of screens in screenshotScreens

Browse source
This commit is contained in:
Méven Car 2020-10-06 17:07:05 +02:00
parent de4e429aed
commit a7aa089ec4
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
effects/screenshot/screenshot.cpp
View file

@ -720,11 +720,9 @@ void ScreenShotEffect::screenshotScreens(QDBusUnixFileDescriptor fd, const QStri
const QList<QScreen *> screens = QGuiApplication::screens(); const QList<QScreen *> screens = QGuiApplication::screens();
QStringList lscreensNames = screensNames;
for (const QScreen *screen : screens) { for (const QScreen *screen : screens) {
const int indexName = lscreensNames.indexOf(screen->name()); const int indexName = screensNames.indexOf(screen->name());
if (indexName != -1) { if (indexName != -1) {
lscreensNames.removeAt(indexName);
const auto screenGeom = screen->geometry(); const auto screenGeom = screen->geometry();
if (!screenGeom.isValid()) { if (!screenGeom.isValid()) {
close(m_fd); close(m_fd);
@ -737,10 +735,10 @@ void ScreenShotEffect::screenshotScreens(QDBusUnixFileDescriptor fd, const QStri
} }
} }
if (!lscreensNames.isEmpty()) { if (m_orderImg.size() != screensNames.size()) {
close(m_fd); close(m_fd);
clearState(); clearState();
sendErrorReply(s_errorScreenMissing, s_errorScreenMissingMsg + " : " + lscreensNames.join(", ")); sendErrorReply(s_errorScreenMissing, s_errorScreenMissingMsg);
return; return;
} }