office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-12 10:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when executing the Save action

Browse source 
Detecting aboutToClose is not enough because savingAs doesn't always go
through aboutToClose it can go through swapBackingFile

BUGS: 467603
This commit is contained in:
Albert Astals Cid 2023-03-29 23:16:33 +02:00
parent 09038f4fb5
commit c62dc60ead
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/document.cpp
View file

@ -4094,9 +4094,35 @@ QString Document::bookmarkedPageRange() const
return range;
}
struct ExecuteNextActionsHelper : public QObject {
struct ExecuteNextActionsHelper : public QObject, private DocumentObserver {
Q_OBJECT
public:
explicit ExecuteNextActionsHelper(Document *doc)
: m_doc(doc)
{
doc->addObserver(this);
connect(doc, &Document::aboutToClose, this, [this] { b = false; });
}
~ExecuteNextActionsHelper() override
{
m_doc->removeObserver(this);
}
void notifySetup(const QVector<Okular::Page *> & /*pages*/, int setupFlags) override
{
if (setupFlags == DocumentChanged || setupFlags == UrlChanged) {
b = false;
}
}
bool shouldExecuteNextAction() const
{
return b;
}
private:
Document *const m_doc;
bool b = true;
};
@ -4107,8 +4133,7 @@ void Document::processAction(const Action *action)
}
// Don't execute next actions if the action itself caused the closing of the document
ExecuteNextActionsHelper executeNextActions;
connect(this, &Document::aboutToClose, &executeNextActions, [&executeNextActions] { executeNextActions.b = false; });
const ExecuteNextActionsHelper executeNextActionsHelper(this);
switch (action->actionType()) {
case Action::Goto: {
@ -4311,7 +4336,7 @@ void Document::processAction(const Action *action)
} break;
}
if (executeNextActions.b) {
if (executeNextActionsHelper.shouldExecuteNextAction()) {
const QVector<Action *> nextActions = action->nextActions();
for (const Action *a : nextActions) {
processAction(a);