fixed a crash when replacing active document during import

15c4ca93 · Clément Fauconnier · efbba6dc · 15c4ca93
Commit 15c4ca93 authored Jul 19, 2019 by Clément Fauconnier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

UBPersistenceManager.cpp src/core/UBPersistenceManager.cpp +6 -0

No files found.
--- a/src/core/UBPersistenceManager.cpp
+++ b/src/core/UBPersistenceManager.cpp
@@ -238,6 +238,12 @@ QDialog::DialogCode UBPersistenceManager::processInteractiveReplacementDialog(UB
                if (i != -1) { //replace
                    QModelIndex replaceIndex = mDocumentTreeStructureModel->index(i, 0, parentIndex);
                    UBDocumentProxy *replaceProxy = mDocumentTreeStructureModel->proxyData(replaceIndex);
+
+                    if (mDocumentTreeStructureModel->currentIndex() == replaceIndex)
+                    {
+                        UBApplication::documentController->selectDocument(pProxy, true, true);
+                    }
+
                    if (replaceProxy) {
                        deleteDocument(replaceProxy);
                    }