[QGIS Commit] r15726 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-04-16 06:23:14 -0700 (Sat, 16 Apr 2011)
New Revision: 15726

Modified:
   trunk/qgis/src/core/qgsmaplayer.cpp
   trunk/qgis/src/core/qgsproject.cpp
Log:
fix #3745

Modified: trunk/qgis/src/core/qgsmaplayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.cpp	2011-04-16 13:01:34 UTC (rev 15725)
+++ trunk/qgis/src/core/qgsmaplayer.cpp	2011-04-16 13:23:14 UTC (rev 15726)
@@ -180,7 +180,7 @@
   {
     QUrl urlSource = QUrl::fromEncoded( mDataSource.toAscii() );
 
-    if ( !mDataSource.startsWith( "file://" ) )
+    if ( !mDataSource.startsWith( "file:" ) )
     {
       QUrl file = QUrl::fromLocalFile( mDataSource.left( mDataSource.indexOf( "?" ) ) );
       urlSource.setScheme( "file" );

Modified: trunk/qgis/src/core/qgsproject.cpp
===================================================================
--- trunk/qgis/src/core/qgsproject.cpp	2011-04-16 13:01:34 UTC (rev 15725)
+++ trunk/qgis/src/core/qgsproject.cpp	2011-04-16 13:23:14 UTC (rev 15726)
@@ -1438,7 +1438,7 @@
 // return the absolute or relative path to write it to the project file
 QString QgsProject::writePath( QString src ) const
 {
-  if ( readBoolEntry( "Paths", "/Absolute", true ) )
+  if ( readBoolEntry( "Paths", "/Absolute", true ) || src.isEmpty() )
   {
     return src;
   }