# HG changeset patch # User insilmaril # Date 1258362437 0 # Node ID bdfc1079a723525a21e8efe8509ae7a8a672b4dc # Parent a36a289372a65651c1ab6d646cee3937f9b2de4b 1.12.5 Fixed crash related to reselecting deleted mapcenter diff -r a36a289372a6 -r bdfc1079a723 mapeditor.cpp --- a/mapeditor.cpp Thu Aug 06 17:33:55 2009 +0000 +++ b/mapeditor.cpp Mon Nov 16 09:07:17 2009 +0000 @@ -1872,9 +1872,6 @@ // TODO take care of multiselections } - // FIXME trying to debug save problem - if (saveFile.length()<1000) - 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)); if (!saveStringToDisk(fileDir+mapFileName,saveFile)) { err=aborted; @@ -2866,6 +2863,7 @@ if (bo && xelection.type()==Selection::MapCenter) { xelection.unselect(); + xelection.clear(); // Otherwise we might get a segfault when trying to reselect saveStateRemovingPart (bo, QString ("Delete %1").arg(getName(bo))); bo=model->removeMapCenter ((MapCenterObj*)bo); if (bo) diff -r a36a289372a6 -r bdfc1079a723 tex/vym.changelog --- a/tex/vym.changelog Thu Aug 06 17:33:55 2009 +0000 +++ b/tex/vym.changelog Mon Nov 16 09:07:17 2009 +0000 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 16 10:03:52 CET 2009 - uwe@insilmaril.de + +- Version: 1.12.5 +- Bugfix: Crash after switching back to a map, where the mapcenter + had been deleted and restored with undo. + ------------------------------------------------------------------- Thu Aug 6 19:32:20 CEST 2009 - uwedr@suse.de diff -r a36a289372a6 -r bdfc1079a723 version.h --- a/version.h Thu Aug 06 17:33:55 2009 +0000 +++ b/version.h Mon Nov 16 09:07:17 2009 +0000 @@ -4,7 +4,7 @@ #include #define __VYM_NAME "VYM" -#define __VYM_VERSION "1.12.4b" +#define __VYM_VERSION "1.12.5" #define __VYM_CODENAME "Maintenance Update " //#define __VYM_CODENAME "Codename: development version" #define __VYM_BUILD_DATE "2009-08-06"