Skip to content

fix(editor): fix window close logic and lambda capture #477

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
lzwind merged 1 commit into from
Jun 11, 2026
Merged

fix(editor): fix window close logic and lambda capture #477

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/startmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,8 +805,8 @@ void StartManager::slotCloseWindow()
// 导致被附加到上一文本编辑器进程
QDBusConnection::sessionBus().unregisterService("com.deepin.Editor");

QTimer::singleShot(1000, []() {
StartManager::instance()->delayMallocTrim();
QTimer::singleShot(1000, [this]() {
this->delayMallocTrim();
QApplication::quit();
});

Expand Down
6 changes: 4 additions & 2 deletions src/widgets/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,8 +1199,10 @@ void Window::removeWrapper(const QString &filePath, bool isDelete)
}
}

// Exit window after close all tabs.
if (m_wrappers.isEmpty()) {
// Exit window after close all tabs (including pending and blank tabs).
// Pending tabs are kept in m_pendingTabs, blank tabs are managed by the tabbar.
// Only close the window when the tabbar has no tabs left.
if (m_wrappers.isEmpty() && m_tabbar->count() == 0) {
close();
qInfo() << "after close";
}
Expand Down
Loading