diff -r d2f72e448522 -r 8c6faaa1e2b1 mapeditor.cpp
--- a/mapeditor.cpp	Mon Mar 03 09:25:40 2008 +0000
+++ b/mapeditor.cpp	Tue Mar 25 11:16:39 2008 +0000
@@ -1661,7 +1661,11 @@
 
 
 		// We need to set the tmpDir in order  to load files with rel. path
-		QString tmpdir= fname.left(fname.findRev("/",-1));	
+		QString tmpdir;
+		if (zipped)
+			tmpdir=tmpZipDir;
+		else
+			tmpdir=fname.left(fname.findRev("/",-1));	
 		handler->setTmpDir (tmpdir);
 		handler->setInputFile (file.name());
 		handler->setLoadMode (lmode);
@@ -1693,18 +1697,16 @@
 		}	
 	}	
 
-	// Delete tmpDir
+	// Delete tmpZipDir
 	removeDir (QDir(tmpZipDir));
 
 	updateActions();
+
 	return err;
 }
 
 ErrorCode MapEditor::save (const SaveMode &savemode)
 {
-	cout <<"ME::save "<<qPrintable (mapName)<<"  zipped="<<zipped<<endl; // FIXME debug
-	// Create mapName and fileDir
-	makeSubDirs (fileDir);
 	QString tmpZipDir;
 	QString mapFileName;
 	QString safeFilePath;
@@ -1757,7 +1759,6 @@
 	{
 		if ( settings.value ("/mapeditor/writeBackupFile").toBool())
 		{
-			cout << "ME::doing backup...\n";//FIXME
 			QString backupFileName(destPath + "~");
 			QFile backupFile(backupFileName);
 			if (backupFile.exists() && !backupFile.remove())
@@ -1789,6 +1790,9 @@
 		setFilePath (tmpZipDir+"/"+ mapName+ ".xml", safeFilePath);
 	} // zipped
 
+	// Create mapName and fileDir
+	makeSubDirs (fileDir);
+
 	QString saveFile;
 	if (savemode==CompleteMap || xelection.isEmpty())
 	{
@@ -1831,17 +1835,6 @@
 	return err;
 }
 
-/* FIXME not needed any longer
-void MapEditor::setZipped (bool z)
-{
-	zipped=z;
-}
-
-bool MapEditor::saveZipped ()
-{
-	return zipped;
-}
-*/
 
 void MapEditor::print()
 {
@@ -2433,6 +2426,7 @@
 {
 	bool old=blockSaveState;
 	blockSaveState=true;
+	bool zippedOrg=zipped;
 	if (redosAvail > 0 || n!=0)
 	{
 		// Use the "historical" buffer
@@ -2442,6 +2436,7 @@
 	} else
 		// Use the global buffer
 		load (clipboardDir+"/"+clipboardFile,ImportAdd, VymMap);
+	zipped=zippedOrg;
 	blockSaveState=old;
 }
 
@@ -3191,6 +3186,7 @@
 	if (bo1)
 	{
 		par=(BranchObj*)(bo1->getParObj());
+		if (!par) return;
 		bo2=par->getFirstBranch();
 		if (bo2) {
 			xelection.select(bo2);
@@ -3209,6 +3205,7 @@
 	if (bo1)
 	{
 		par=(BranchObj*)(bo1->getParObj());
+		if (!par) return;
 		bo2=par->getLastBranch();
 		if (bo2) 
 		{
@@ -5217,6 +5214,7 @@
 	cout << "fsaved: "<<qPrintable (fileChangedTime.toString())<<endl;
 	cout << "  fnow: "<<qPrintable (QFileInfo(filePath).lastModified().toString())<<endl;
 	cout << "  time: "<<qPrintable (now.toString())<<endl;
+	cout << " zipped="<<zipped<<endl;
 	*/
 	// Disable autosave, while we have gone back in history
 	int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));