1.1 --- a/mapeditor.cpp Thu Aug 07 14:41:17 2008 +0000
1.2 +++ b/mapeditor.cpp Sun Oct 05 09:15:00 2008 +0000
1.3 @@ -3685,6 +3685,17 @@
1.4 if (bo)
1.5 {
1.6 par=(BranchObj*)(bo->getParObj());
1.7 +
1.8 + // Don't use this on mapcenter
1.9 + if (!par) return;
1.10 +
1.11 + // Check if we have childs at all to keep
1.12 + if (bo->countBranches()==0)
1.13 + {
1.14 + deleteSelection();
1.15 + return;
1.16 + }
1.17 +
1.18 QPointF p=bo->getRelPos();
1.19 saveStateChangingPart(
1.20 bo->getParObj(),
2.1 --- a/tex/vym.changelog Thu Aug 07 14:41:17 2008 +0000
2.2 +++ b/tex/vym.changelog Sun Oct 05 09:15:00 2008 +0000
2.3 @@ -1,3 +1,14 @@
2.4 +-------------------------------------------------------------------
2.5 +Sun Oct 5 10:48:51 CEST 2008 - uwe
2.6 +
2.7 +- Version: 1.12.2
2.8 +- Bugfix: No more segfault for "delete & keep childs" on MapCenter
2.9 +
2.10 +-------------------------------------------------------------------
2.11 +Sun Jul 27 16:36:30 CEST 2008 - uwedr@suse.de
2.12 +
2.13 +- Version: 1.12.1
2.14 +
2.15 -------------------------------------------------------------------
2.16 Sun Jul 27 16:36:29 CEST 2008 - uwedr@suse.de
2.17
3.1 --- a/version.h Thu Aug 07 14:41:17 2008 +0000
3.2 +++ b/version.h Sun Oct 05 09:15:00 2008 +0000
3.3 @@ -4,10 +4,10 @@
3.4 #include <QString>
3.5
3.6 #define __VYM_NAME "VYM"
3.7 -#define __VYM_VERSION "1.12.1"
3.8 +#define __VYM_VERSION "1.12.2"
3.9 #define __VYM_CODENAME "Maintenance Update"
3.10 //#define __VYM_CODENAME "Codename: development version"
3.11 -#define __VYM_BUILD_DATE "2008-08-07"
3.12 +#define __VYM_BUILD_DATE "2008-10-05"
3.13
3.14
3.15 bool checkVersion(const QString &);