forked from qt-creator/qt-creator
Merge commit 'origin/master'
This commit is contained in:
@@ -1236,6 +1236,8 @@ void EditorManager::addCurrentPositionToNavigationHistory(bool compress)
|
|||||||
if ((previousLocation->editor && editor == previousLocation->editor)
|
if ((previousLocation->editor && editor == previousLocation->editor)
|
||||||
|| (!fileName.isEmpty() && previousLocation->fileName == fileName)) {
|
|| (!fileName.isEmpty() && previousLocation->fileName == fileName)) {
|
||||||
firstIndexToRemove = m_d->currentNavigationHistoryPosition;
|
firstIndexToRemove = m_d->currentNavigationHistoryPosition;
|
||||||
|
} else {
|
||||||
|
firstIndexToRemove = m_d->currentNavigationHistoryPosition+1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
firstIndexToRemove = m_d->currentNavigationHistoryPosition+1;
|
firstIndexToRemove = m_d->currentNavigationHistoryPosition+1;
|
||||||
|
Reference in New Issue
Block a user