fix crash when digitizing a part and adding it to a (cached) single p…

…art geometry
qgis · Jun 11, 2015 · 1749733 · 1749733
1 parent 95cc4ba
commit 1749733
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/plugins/processing/tests/PackagingTests.py b/python/plugins/processing/tests/PackagingTests.py
@@ -27,8 +27,8 @@ def testGrass(self):
 
     def testOtb(self):
         folder = OTBUtils.findOtbPath()
-        self.assertIsNotNone(folder)            
+        self.assertIsNotNone(folder)
 
 def runTests():
     t = unittest.TestLoader().loadTestsFromTestCase(PackageTests)
-    unittest.TextTestRunner(verbosity=3, stream=sys.stdout).run(t)
+    unittest.TextTestRunner(verbosity=3, stream=sys.stdout).run(t)
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -904,8 +904,8 @@ bool QgsGeometry::convertToMultiType()
     return false;
   }
 
+  detach( true );
   multiGeom->addGeometry( d->geometry );
-  detach( false );
   d->geometry = multiGeom;
   removeWkbGeos();
   return true;