summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/qtextdocument_p.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index e2fdf0e..969d5b4 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -259,8 +259,7 @@ void QTextDocumentPrivate::clear()
objects.clear();
title.clear();
- undoState = 0;
- clearUndoRedoStacks(QTextDocument::RedoStack);
+ clearUndoRedoStacks(QTextDocument::UndoAndRedoStacks);
text = QString();
unreachableCharacterCount = 0;
modifiedState = 0;
@@ -1077,7 +1076,7 @@ void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToCle
if (emitSignals)
emitRedoAvailable(false);
} else if (stacksToClear == QTextDocument::UndoAndRedoStacks
- && (undoCommandsAvailable || redoCommandsAvailable)) {
+ && !undoStack.isEmpty()) {
for (int i = 0; i < undoStack.size(); ++i) {
QTextUndoCommand c = undoStack[i];
if (c.command & QTextUndoCommand::Custom)