fix #2654

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13309 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 14, 2010 · c71921a · c71921a
1 parent 8d843fe
commit c71921a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3634,7 +3634,7 @@ void QgisApp::saveMapAsImage()
     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] );
 

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -443,7 +443,7 @@ void QgsMapCanvas::saveAsImage( QString theFileName, QPixmap * theQPixmap, QStri
   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
   {