diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-11 10:45:01 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-11 10:45:01 (GMT) |
| commit | 29d4342b2f87183e4bd4c2611aea157834c0f492 (patch) | |
| tree | 3ee977455745d5ed7c03a59883eba13b0f2756db | |
| parent | e396749026f1a22f905540befa9e2ed8ba8b46b9 (diff) | |
| download | Qt-29d4342b2f87183e4bd4c2611aea157834c0f492.zip Qt-29d4342b2f87183e4bd4c2611aea157834c0f492.tar.gz Qt-29d4342b2f87183e4bd4c2611aea157834c0f492.tar.bz2 | |
Fixed cleaning of both undo- and redo-stacks.
| -rw-r--r-- | src/gui/text/qtextdocument_p.cpp | 5 |
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) |