Merge remote-tracking branch 'cc9cii/master'

apps/opencs/editor.cpp

@@ -379,5 +379,5 @@ void CS::Editor::documentAdded (CSMDoc::Document *document)
 
 void CS::Editor::lastDocumentDeleted()
 {
-    exit (0);
+    QApplication::quit();
 }

apps/opencs/view/doc/view.cpp

@@ -464,8 +464,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 {
     CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
 
-    const std::vector<CSMWorld::UniversalId::Type> referenceables(CSMWorld::UniversalId::listReferenceableTypes());
-    bool isReferenceable = std::find(referenceables.begin(), referenceables.end(), id.getType()) != referenceables.end();
+    bool isReferenceable = id.getClass() == CSMWorld::UniversalId::Class_RefRecord;
 
     // User setting to reuse sub views (on a per top level view basis)
     bool reuse =
@@ -474,10 +473,14 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     {
         foreach(SubView *sb, mSubViews)
         {
-            if((isReferenceable && (CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, id.getId()) == CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, sb->getUniversalId().getId())))
-                || (!isReferenceable && (id == sb->getUniversalId())))
+            bool isSubViewReferenceable =
+                sb->getUniversalId().getType() == CSMWorld::UniversalId::Type_Referenceable;
+
+            if((isReferenceable && isSubViewReferenceable && id.getId() == sb->getUniversalId().getId())
+               ||
+               (!isReferenceable && id == sb->getUniversalId()))
             {
-                sb->setFocus(Qt::OtherFocusReason); // FIXME: focus not quite working
+                sb->setFocus();
                 return;
             }
         }
@@ -497,7 +500,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     }
 
     SubView *view = NULL;
-    if(std::find(referenceables.begin(), referenceables.end(), id.getType()) != referenceables.end())
+    if(isReferenceable)
     {
         view = mSubViewFactory.makeSubView (CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Referenceable, id.getId()), *mDocument);
     }