# HG changeset patch
# User insilmaril
# Date 1270637124 0
# Node ID c48bb42fb9779038d99f57e75501d04b6d6fa2f0
# Parent  2d36a7bb086752b5b4e8a71ee713746f7fe3aef9
Removing map and HTML export fixed

diff -r 2d36a7bb0867 -r c48bb42fb977 exports.cpp
--- a/exports.cpp	Tue Apr 06 13:30:07 2010 +0000
+++ b/exports.cpp	Wed Apr 07 10:45:24 2010 +0000
@@ -711,7 +711,7 @@
 
 
 	dia.saveSettings();
-	model->setExportMode (true);
+	model->setExportMode (false);
 }
 
 ////////////////////////////////////////////////////////////////////////
diff -r 2d36a7bb0867 -r c48bb42fb977 mainwindow.cpp
--- a/mainwindow.cpp	Tue Apr 06 13:30:07 2010 +0000
+++ b/mainwindow.cpp	Wed Apr 07 10:45:24 2010 +0000
@@ -2618,15 +2618,8 @@
 		vymViews.removeAt (tabWidget->currentIndex() );
 		tabWidget->removeTab (tabWidget->currentIndex() );
 
-		// Remove mapEditor/model FIXME-3   Huh? seems to work now...
-		// Better would be delete (me), but then we could have a Qt error:
-		// "QObject: Do not delete object, 'MapEditor', during its event handler!"
-		// So we only remove data now and call deconstructor when vym closes later
-		// this needs to be moved to vymview...   me->clear();
-		// some model->clear is needed to free up memory ...
-
-		delete (m->getMapEditor());
-		delete (m);
+		delete (m); // changing model still will try to update selection in editors, remove model first
+		//delete (m->getMapEditor());
 
 		updateActions();
 	}
diff -r 2d36a7bb0867 -r c48bb42fb977 mapeditor.cpp
--- a/mapeditor.cpp	Tue Apr 06 13:30:07 2010 +0000
+++ b/mapeditor.cpp	Wed Apr 07 10:45:24 2010 +0000
@@ -161,7 +161,7 @@
 MapEditor::~MapEditor()
 {
 	//qDebug() <<"Destructor MapEditor for "<<model->getMapName();
-	model->unregisterEditor(this);
+	//model->unregisterEditor(this);
 }
 
 VymModel* MapEditor::getModel()
diff -r 2d36a7bb0867 -r c48bb42fb977 vym.changelog
--- a/vym.changelog	Tue Apr 06 13:30:07 2010 +0000
+++ b/vym.changelog	Wed Apr 07 10:45:24 2010 +0000
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr  7 12:01:25 CEST 2010 - vym@insilmaril.de
+
+- Version: 1.13.2   
+- Bugfix: Segfault when removing a map
+- Bugfix: Fixed regression in HTML export, which could lead to dataloss
+          (not unhiding branches which are hidden during export)
+
 -------------------------------------------------------------------
 Tue Mar 30 19:29:43 CEST 2010 - vym@insilmaril.de
 
diff -r 2d36a7bb0867 -r c48bb42fb977 vymmodel.cpp
--- a/vymmodel.cpp	Tue Apr 06 13:30:07 2010 +0000
+++ b/vymmodel.cpp	Wed Apr 07 10:45:24 2010 +0000
@@ -67,10 +67,12 @@
 	autosaveTimer->stop();
 	fileChangedTimer->stop();
 	clear();
+	if (mapEditor) delete (mapEditor);
 }	
 
 void VymModel::clear() 
 {
+	unselect();
 	while (rootItem->childCount() >0)
 		deleteItem (rootItem->getChildNum(0) );
 }