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

[Oliver Kellogg]

SVN commit 630936 by okellogg:

addView(): Fix error introduced by commit 577629.
http://sourceforge.net/mailarchive/forum.php?thread_id=31583721&forum_id=460
CCMAIL:plegal at appert44.org
BUG:140870


 M  +3 -1      ChangeLog  
 M  +2 -7      umbrello/umldoc.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #630935:630936
@@ -1,7 +1,9 @@
 Version 1.5.61
 
-* Fixed crash on anchoring note to diagram object
+* Bugs fixed from http://bugs.kde.org:
+* Fixed crash on creating various types of associations (140693, 141073, 141106, 141277)
   http://sourceforge.net/mailarchive/forum.php?thread_id=31539549&forum_id=460
+* Unclickable use case diagram (140870)
 
 Version 1.5.6
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umldoc.cpp #630935:630936
@@ -147,15 +147,10 @@
     if ( pApp->getListView() )
         connect(this, SIGNAL(sigObjectRemoved(UMLObject *)), view, SLOT(slotObjectRemoved(UMLObject *)));
 
-    UMLView * previousView = pApp->getCurrentView();
     pApp->setCurrentView(view);
     if ( ! m_bLoading ) {
-        if (previousView == NULL) {
-            view -> show();
-            emit sigDiagramChanged(view ->getType());
-        } else {
-            view -> hide();
-        }
+        view -> show();
+        emit sigDiagramChanged(view ->getType());
     }
 
     Settings::OptionState optionState = Settings::getOptionState();