also save edit types and actions for geometry-less layers

jef · jef · commit 90738ffe950b · 2010-11-24T00:10:55.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14755 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2562,12 +2562,9 @@ bool QgsVectorLayer::readXml( QDomNode & layer_node )
   }
 
   QString errorMsg;
-  if ( geometryType() != QGis::NoGeometry )
+  if ( !readSymbology( layer_node, errorMsg ) )
   {
-    if ( !readSymbology( layer_node, errorMsg ) )
-    {
-      return false;
-    }
+    return false;
   }
 
   return mValid;               // should be true if read successfully

Original file line number	Diff line number	Diff line change
`@@ -2562,12 +2562,9 @@ bool QgsVectorLayer::readXml( QDomNode & layer_node )`
`2562`	`2562`	`}`
`2563`	`2563`
`2564`	`2564`	`QString errorMsg;`
`2565`		`- if ( geometryType() != QGis::NoGeometry )`
	`2565`	`+ if ( !readSymbology( layer_node, errorMsg ) )`
`2566`	`2566`	`{`
`2567`		`- if ( !readSymbology( layer_node, errorMsg ) )`
`2568`		`- {`
`2569`		`- return false;`
`2570`		`- }`
	`2567`	`+ return false;`
`2571`	`2568`	`}`
`2572`	`2569`
`2573`	`2570`	`return mValid; // should be true if read successfully`