fix #5176

qgis · May 18, 2012 · 56808d91a12ddb33b1d173778f3b47b136876093 · 56808d9
1 parent 85cf8c3
commit 56808d91a12ddb33b1d173778f3b47b136876093
Showing with 23 additions and 12 deletions.

+23 −12 src/core/qgscoordinatereferencesystem.cpp
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1051,27 +1051,38 @@ bool QgsCoordinateReferenceSystem::readXML( QDomNode & theNode )
   {
     bool initialized = false;
 
-    QDomNode myNode = srsNode.namedItem( "authid" );
-    if ( !myNode.isNull() )
-    {
-      operator=( QgsCRSCache::instance()->crsByAuthId( myNode.toElement().text() ) );
-      if ( isValid() )
-      {
-        initialized = true;
-      }
-    }
+    long srsid = srsNode.namedItem( "srsid" ).toElement().text().toLong();
 
-    if ( !initialized )
+    QDomNode myNode;
+
+    if ( srsid < USER_CRS_START_ID )
     {
-      myNode = srsNode.namedItem( "epsg" );
+      myNode = srsNode.namedItem( "authid" );
       if ( !myNode.isNull() )
       {
-        operator=( QgsCRSCache::instance()->crsByEpsgId( myNode.toElement().text().toLong() ) );
+        operator=( QgsCRSCache::instance()->crsByAuthId( myNode.toElement().text() ) );
         if ( isValid() )
         {
           initialized = true;
         }
       }
+
+      if ( !initialized )
+      {
+        myNode = srsNode.namedItem( "epsg" );
+        if ( !myNode.isNull() )
+        {
+          operator=( QgsCRSCache::instance()->crsByEpsgId( myNode.toElement().text().toLong() ) );
+          if ( isValid() )
+          {
+            initialized = true;
+          }
+        }
+      }
+    }
+    else
+    {
+      QgsDebugMsg( "Ignoring authid/epsg for user crs." );
     }
 
     if ( initialized )