[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [umbrello/Applications/15.08] umbrello: Recreate datatype folder on document close after deleting st
From:       Ralf Habacker <ralf.habacker () freenet ! de>
Date:       2015-10-07 16:37:06
Message-ID: E1ZjriE-00087X-8T () scm ! kde ! org
[Download RAW message or body]

Git commit 36eb4d747445fdf95c358e505f1442ffbf27ced3 by Ralf Habacker.
Committed on 07/10/2015 at 16:36.
Pushed by habacker into branch 'Applications/15.08'.

Recreate datatype folder on document close after deleting stereotypes.

Unfortunally there are still referenced stereotypes, so no not assert
in UMLStereotype destructor.

CCBUG:345546t

M  +1    -1    umbrello/stereotype.cpp
M  +5    -5    umbrello/umldoc.cpp

http://commits.kde.org/umbrello/36eb4d747445fdf95c358e505f1442ffbf27ced3

diff --git a/umbrello/stereotype.cpp b/umbrello/stereotype.cpp
index ef5838e..3f5dd68 100644
--- a/umbrello/stereotype.cpp
+++ b/umbrello/stereotype.cpp
@@ -59,7 +59,7 @@ UMLStereotype::UMLStereotype()
  */
 UMLStereotype::~UMLStereotype()
 {
-    Q_ASSERT(m_refCount == 0);
+    //Q_ASSERT(m_refCount == 0);
 }
 
 /**
diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp
index 56cac2f..17b6a24 100644
--- a/umbrello/umldoc.cpp
+++ b/umbrello/umldoc.cpp
@@ -405,11 +405,6 @@ void UMLDoc::closeDocument()
         // @fixme With advanced code generation enabled, this crashes.
         removeAllObjects();
 
-        // Restore the datatype folder, it has been deleted above.
-        createDatatypeFolder();
-        // this creates to much items only Logical View should be created
-        listView->init();
-
         // Remove any stereotypes.
         if (stereotypes().count() > 0) {
             foreach(UMLStereotype *s, stereotypes()) {
@@ -418,6 +413,11 @@ void UMLDoc::closeDocument()
             }
             m_stereoList.clear();
         }
+
+        // Restore the datatype folder, it has been deleted above.
+        createDatatypeFolder();
+        // this creates to much items only Logical View should be created
+        listView->init();
     }
     m_bClosing = false;
 }
[prev in list] [next in list] [prev in thread] [next in thread]