diff -r 67a91e28b30f -r 4083860dd82e mainwindow.cpp
--- a/mainwindow.cpp	Mon Jun 06 20:27:42 2005 +0000
+++ b/mainwindow.cpp	Tue Jun 14 09:41:37 2005 +0000
@@ -967,7 +967,7 @@
 
     a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" ), 0, this, "exportASCII" );
     connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
-	// FIXME deactivated, doesn't work with QRichtext anyway
+	// TODO deactivated, doesn't work with QRichtext anyway
 	//   a->addTo( exportMenu );
 
 	a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ),  0, this, "exportXML" );
@@ -1313,8 +1313,7 @@
 						{
 							for ( QStringList::Iterator it = flist.begin(); it != flist.end(); ++it ) 
 								*it=tmpMapDir + "/" + *it;
-							// FIXME	
-							// Multiple entries, load all (but only the first one into this ME)
+							// FIXME Multiple entries, load all (but only the first one into this ME)
 							//mainWindow->fileLoadFromTmp (flist);
 							//returnCode=1;	// Silently forget this attempt to load
 							qWarning ("MainWindow::load (fn)  multimap found...");
@@ -1333,11 +1332,19 @@
 			}
 		}
 
+
+		// Save existing filename
+		QString fn_org=me->getFilePath();
+
 		// Finally load map into mapEditor
 		me->setFilePath (mapfile,fn);
 		if (me->load(mapfile,lmode))
 			err=aborted;
 
+		// Restore old (maybe empty) filepath, if this is an import
+		if (lmode!=NewMap)
+			me->setFilePath (fn_org);
+			
 		// Delete tmpDir
 		system ( "rm -rf "+tmpMapDir);