Merge commit 'origin/master'

This commit is contained in:
dt
2009-01-30 14:32:45 +01:00

View File

@@ -1236,6 +1236,8 @@ void EditorManager::addCurrentPositionToNavigationHistory(bool compress)
if ((previousLocation->editor && editor == previousLocation->editor)
|| (!fileName.isEmpty() && previousLocation->fileName == fileName)) {
firstIndexToRemove = m_d->currentNavigationHistoryPosition;
} else {
firstIndexToRemove = m_d->currentNavigationHistoryPosition+1;
}
} else {
firstIndexToRemove = m_d->currentNavigationHistoryPosition+1;