[QGIS Commit] r13309 - in trunk/qgis/src: app gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-04-14 09:44:14 -0400 (Wed, 14 Apr 2010)
New Revision: 13309

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/gui/qgsmapcanvas.cpp
Log:
fix #2654

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-04-14 06:59:46 UTC (rev 13308)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-04-14 13:44:14 UTC (rev 13309)
@@ -3634,7 +3634,7 @@
     myOutputFileNameQString = myQFileDialog->selectedFiles().first();
   }
 
-  QString myFilterString = myQFileDialog->selectedFilter() + ";;";
+  QString myFilterString = myQFileDialog->selectedFilter();
   QgsDebugMsg( "Selected filter: " + myFilterString );
   QgsDebugMsg( "Image type to be passed to mapcanvas: " + myFilterMap[myFilterString] );
 

Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp	2010-04-14 06:59:46 UTC (rev 13308)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp	2010-04-14 13:44:14 UTC (rev 13309)
@@ -443,7 +443,7 @@
   myHeader += QString::number( myRect.yMaximum() - ( mapUnitsPerPixel() / 2 ), 'g', 17 ) + "\r\n";
   QFileInfo myInfo  = QFileInfo( theFileName );
   // allow dotted names
-  QString myWorldFileName = myInfo.absolutePath() + QDir::separator() + myInfo.completeBaseName() + "." + theFormat + "w";
+  QString myWorldFileName = myInfo.absolutePath() + myInfo.completeBaseName() + "." + theFormat + "w";
   QFile myWorldFile( myWorldFileName );
   if ( !myWorldFile.open( QIODevice::WriteOnly ) ) //don't use QIODevice::Text
   {