1.12.5 Fixed crash related to reselecting deleted mapcenter release-1-12-maintained
authorinsilmaril
Mon Nov 16 09:07:17 2009 +0000 (2009-11-16)
branchrelease-1-12-maintained
changeset 77bdfc1079a723
parent 76 a36a289372a6
child 78 1a72c8f24c6e
1.12.5 Fixed crash related to reselecting deleted mapcenter
mapeditor.cpp
tex/vym.changelog
version.h
     1.1 --- a/mapeditor.cpp	Thu Aug 06 17:33:55 2009 +0000
     1.2 +++ b/mapeditor.cpp	Mon Nov 16 09:07:17 2009 +0000
     1.3 @@ -1872,9 +1872,6 @@
     1.4  		// TODO take care of multiselections
     1.5  	}	
     1.6  
     1.7 -	// FIXME trying to debug save problem
     1.8 -	if (saveFile.length()<1000)
     1.9 -		QMessageBox::critical (0,"Critical error in MapEditor::save",QString("saveFile is too small, try make a backup NOW\nof your original file\nbefore vym writes to\"%1\":\n%2").arg(mapName).arg(saveFile));
    1.10  	if (!saveStringToDisk(fileDir+mapFileName,saveFile))
    1.11  	{
    1.12  		err=aborted;
    1.13 @@ -2866,6 +2863,7 @@
    1.14  	if (bo && xelection.type()==Selection::MapCenter)
    1.15  	{
    1.16  		xelection.unselect();
    1.17 +		xelection.clear();	// Otherwise we might get a segfault when trying to reselect
    1.18  		saveStateRemovingPart (bo, QString ("Delete %1").arg(getName(bo)));
    1.19  		bo=model->removeMapCenter ((MapCenterObj*)bo);
    1.20  		if (bo) 
     2.1 --- a/tex/vym.changelog	Thu Aug 06 17:33:55 2009 +0000
     2.2 +++ b/tex/vym.changelog	Mon Nov 16 09:07:17 2009 +0000
     2.3 @@ -1,3 +1,10 @@
     2.4 +-------------------------------------------------------------------
     2.5 +Mon Nov 16 10:03:52 CET 2009 - uwe@insilmaril.de
     2.6 +
     2.7 +- Version: 1.12.5
     2.8 +- Bugfix: Crash after switching back to a map, where the mapcenter
     2.9 +          had been deleted and restored with undo.
    2.10 +
    2.11  -------------------------------------------------------------------
    2.12  Thu Aug  6 19:32:20 CEST 2009 - uwedr@suse.de
    2.13  
     3.1 --- a/version.h	Thu Aug 06 17:33:55 2009 +0000
     3.2 +++ b/version.h	Mon Nov 16 09:07:17 2009 +0000
     3.3 @@ -4,7 +4,7 @@
     3.4  #include <QString>
     3.5  
     3.6  #define __VYM_NAME "VYM"
     3.7 -#define __VYM_VERSION "1.12.4b"
     3.8 +#define __VYM_VERSION "1.12.5"
     3.9  #define __VYM_CODENAME "Maintenance Update "
    3.10  //#define __VYM_CODENAME "Codename: development version"
    3.11  #define __VYM_BUILD_DATE "2009-08-06"