Merge remote-tracking branch 'cc9cii/master'

apps/opencs/view/world/dialoguesubview.cpp

@@ -603,6 +603,7 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
     mCommandDispatcher (document, CSMWorld::UniversalId::getParentType (id.getType()))
 {
     connect(mTable, SIGNAL(dataChanged (const QModelIndex&, const QModelIndex&)), this, SLOT(dataChanged(const QModelIndex&)));
+    connect(mTable, SIGNAL(rowsAboutToBeRemoved(const QModelIndex&, int, int)), this, SLOT(rowsAboutToBeRemoved(const QModelIndex&, int, int)));
 
     changeCurrentId(id.getId());
 
@@ -765,6 +766,9 @@ void CSVWorld::DialogueSubView::nextId ()
 
 void CSVWorld::DialogueSubView::setEditLock (bool locked)
 {
+    if (!mEditWidget) // hack to indicate that mCurrentId is no longer valid
+        return;
+
     mLocked = locked;
     QModelIndex currentIndex(mTable->getModelIndex(mCurrentId, 0));
 
@@ -794,6 +798,21 @@ void CSVWorld::DialogueSubView::dataChanged (const QModelIndex & index)
     }
 }
 
+void CSVWorld::DialogueSubView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+{
+    QModelIndex currentIndex(mTable->getModelIndex(mCurrentId, 0));
+
+    if (currentIndex.isValid() && currentIndex.row() >= start && currentIndex.row() <= end)
+    {
+        if(mEditWidget)
+        {
+            delete mEditWidget;
+            mEditWidget = 0;
+        }
+        emit closeRequest(this);
+    }
+}
+
 void CSVWorld::DialogueSubView::tableMimeDataDropped (QWidget* editor,
                                                       const QModelIndex& index,
                                                       const CSMWorld::UniversalId& id,

apps/opencs/view/world/dialoguesubview.hpp

@@ -235,6 +235,8 @@ namespace CSVWorld
                                       const CSMDoc::Document* document);
 
             void requestFocus (const std::string& id);
+
+            void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
     };
 }