[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 1280254 by okellogg:

UMLDoc::addView():
- In the debug message " to folder ", mention the view->name()
- Reduce number of calls to UMLApp::setCurrentView() while loading.
  Reason: Else we get a lot of tab update notifications which are unnecessary
  during load and which ultimately lead to calls to UMLListView::findView() which
  then return NULL because the views are not yet known there at that time.


 M  +3 -1      umldoc.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #1280253:1280254
@@ -171,7 +171,7 @@
         uError() << "view folder is not set";
         return;
     }
-    DEBUG(DBG_SRC) << "to folder " << *f;
+    DEBUG(DBG_SRC) << view->name() << " to folder " << *f;
     f->addView(view);
 
     UMLApp * pApp = UMLApp::app();
@@ -179,7 +179,9 @@
         connect(this, SIGNAL(sigObjectRemoved(UMLObject*)), view->umlScene(), SLOT(slotObjectRemoved(UMLObject*)));
     }
 
+    if ( !m_bLoading || pApp->currentView() == NULL ) {
     pApp->setCurrentView(view);
+    }
     if ( !m_bLoading ) {
         view->show();
         emit sigDiagramChanged(view->umlScene()->type());