fix crash from #2067. anyway loading of osm layers with custom render…

…ers doesn't work (and won't work because of technical limitations) git-svn-id: http://svn.osgeo.org/qgis/trunk@12041 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 8, 2009 · 61d45be · 61d45be
1 parent c1b360b
commit 61d45be
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2232,6 +2232,11 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
         // deal with unnecessary schema qualification to make v.in.ogr happy
         mDataSource = mDataProvider->dataSourceUri();
       }
+      else if ( mProviderKey == "osm" )
+      {
+        // make sure that the "observer" has been removed from URI to avoid crashes
+        mDataSource = mDataProvider->dataSourceUri();
+      }
 
       // label
       mLabel = new QgsLabel( mDataProvider->fields() );

diff --git a/src/providers/osm/osmprovider.cpp b/src/providers/osm/osmprovider.cpp
@@ -93,9 +93,25 @@ QgsOSMDataProvider::QgsOSMDataProvider( QString uri )
     }
     if ( propName == "observer" )
     {
+      // remove observer from the URI
+      // (because otherwise it would be saved into project file and would cause crashes)
+      QString newProps;
+      foreach ( QString p , props )
+      {
+        if (!p.startsWith("observer"))
+        {
+          if (!newProps.isEmpty())
+            newProps += "&";
+          newProps += p;
+        }
+      }
+      QString newUri = uri.left( fileNameEnd + 1 ) + newProps;
+      setDataSourceUri(newUri);
+
       ulong observerAddr = propValue.toULong();
       mInitObserver = ( QObject* ) observerAddr;
       mInitObserver->setProperty( "osm_state", QVariant( 1 ) );
+
     }
     if ( propName == "tag" )
     {