diff options
author | mae <qtc-committer@nokia.com> | 2009-02-13 15:59:14 +0100 |
---|---|---|
committer | mae <qtc-committer@nokia.com> | 2009-02-13 15:59:14 +0100 |
commit | 33e878333874979c157fff57fb5fd073348f0423 (patch) | |
tree | 075da7cec0f4b14a7f0b1aaf40d6f63f1860d7b3 | |
parent | 957710f4642ffc6b86378937cd58c8bc62a47847 (diff) | |
download | qt-creator-33e878333874979c157fff57fb5fd073348f0423.tar.gz |
update current navigation history position only for the current position
-rw-r--r-- | src/plugins/coreplugin/editormanager/editormanager.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 06aa72a3a5..6dce1583f5 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1344,8 +1344,6 @@ void EditorManager::addCurrentPositionToNavigationHistory(bool compress) if (!editor->file()) return; - qDebug() << "addCurrentPositionToNavigationHistory" << editor->file()->fileName(); - QString fileName = editor->file()->fileName(); QByteArray state = editor->saveState(); // cut existing @@ -1382,13 +1380,11 @@ void EditorManager::addCurrentPositionToNavigationHistory(bool compress) void EditorManager::updateCurrentPositionInNavigationHistory() { - if (!m_d->m_currentEditor) + if (!m_d->m_currentEditor + || m_d->currentNavigationHistoryPosition < 0 + || m_d->m_navigationHistory.at(m_d->currentNavigationHistoryPosition)->editor != m_d->m_currentEditor) return; - foreach (EditorManagerPrivate::EditLocation *location, m_d->m_navigationHistory) - if (location->editor == m_d->m_currentEditor) { - location->state = location->editor->saveState(); - break; - } + m_d->m_navigationHistory.at(m_d->currentNavigationHistoryPosition)->state = m_d->m_currentEditor->saveState(); } void EditorManager::goBackInNavigationHistory() |