Skip to content

fix(screenshot): prevent multiple simultaneous screenshot requests #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Apr 16, 2026
Merged

fix(screenshot): prevent multiple simultaneous screenshot requests #822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/dbusservice/dbusscreenshotservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,15 @@ void DBusScreenshotService::TopWindowScreenshot()
{"startup_mode", "B3"}
};
EventLogUtils::get().writeLogs(obj);
if (!m_singleInstance) {
qCDebug(dsrApp) << "Starting new top window screenshot instance";
parent()->topWindowScreenshot();
if (m_singleInstance) {
qCDebug(dsrApp) << "Screenshot already in progress, ignoring.";
return;
}
// topWindowScreenshot() 内部会同步调用 saveAction() → QFileDialog，
// 模态对话框的嵌套事件循环仍会处理 D-Bus 消息，必须在调用前置标志位
m_singleInstance = true;
qCDebug(dsrApp) << "Starting new top window screenshot instance";
parent()->topWindowScreenshot();
qCDebug(dsrApp) << "TopWindowScreenshot method finished.";
}

Expand All @@ -182,11 +186,15 @@ void DBusScreenshotService::FullscreenScreenshot()
{"startup_mode", "B1"}
};
EventLogUtils::get().writeLogs(obj);
if (!m_singleInstance) {
qCDebug(dsrApp) << "Starting new fullscreen screenshot instance";
parent()->fullscreenScreenshot();
if (m_singleInstance) {
qCDebug(dsrApp) << "Screenshot already in progress, ignoring.";
return;
}
// fullscreenScreenshot() 内部会同步调用 saveAction() → QFileDialog，
// 模态对话框的嵌套事件循环仍会处理 D-Bus 消息，必须在调用前置标志位
m_singleInstance = true;
qCDebug(dsrApp) << "Starting new fullscreen screenshot instance";
parent()->fullscreenScreenshot();
qCDebug(dsrApp) << "FullscreenScreenshot method finished.";
}

Expand Down
Loading