Fix crash and corruption of project file when saving project with non spatial layers. Fix issue preventing projects with non-spatial layers being loaded.

timlinux · timlinux · commit 93a56bbfcced · 2010-10-17T22:25:27.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14390 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2499,9 +2499,12 @@ bool QgsVectorLayer::readXml( QDomNode & layer_node )
   }
 
   QString errorMsg;
-  if ( !readSymbology( layer_node, errorMsg ) )
+  if ( geometryType() != QGis::NoGeometry )
   {
-    return false;
+    if ( !readSymbology( layer_node, errorMsg ) )
+    {
+      return false;
+    }
   }
 
   return mValid;               // should be true if read successfully
@@ -2645,11 +2648,13 @@ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
 
   // renderer specific settings
   QString errorMsg;
-  if ( !writeSymbology( layer_node, document, errorMsg ) )
+  if ( geometryType() != QGis::NoGeometry )
   {
-    return false;
+    if ( !writeSymbology( layer_node, document, errorMsg ) )
+    {
+      return false;
+    }
   }
-
   return true;
 } // bool QgsVectorLayer::writeXml
 

Original file line number	Diff line number	Diff line change
`@@ -2499,9 +2499,12 @@ bool QgsVectorLayer::readXml( QDomNode & layer_node )`
`2499`	`2499`	`}`
`2500`	`2500`
`2501`	`2501`	`QString errorMsg;`
`2502`		`- if ( !readSymbology( layer_node, errorMsg ) )`
	`2502`	`+ if ( geometryType() != QGis::NoGeometry )`
`2503`	`2503`	`{`
`2504`		`- return false;`
	`2504`	`+ if ( !readSymbology( layer_node, errorMsg ) )`
	`2505`	`+ {`
	`2506`	`+ return false;`
	`2507`	`+ }`
`2505`	`2508`	`}`
`2506`	`2509`
`2507`	`2510`	`return mValid; // should be true if read successfully`
`@@ -2645,11 +2648,13 @@ bool QgsVectorLayer::writeXml( QDomNode & layer_node,`
`2645`	`2648`
`2646`	`2649`	`// renderer specific settings`
`2647`	`2650`	`QString errorMsg;`
`2648`		`- if ( !writeSymbology( layer_node, document, errorMsg ) )`
	`2651`	`+ if ( geometryType() != QGis::NoGeometry )`
`2649`	`2652`	`{`
`2650`		`- return false;`
	`2653`	`+ if ( !writeSymbology( layer_node, document, errorMsg ) )`
	`2654`	`+ {`
	`2655`	`+ return false;`
	`2656`	`+ }`
`2651`	`2657`	`}`
`2652`		`-`
`2653`	`2658`	`return true;`
`2654`	`2659`	`} // bool QgsVectorLayer::writeXml`
`2655`	`2660`