# HG changeset patch
# User insilmaril
# Date 1223198100 0
# Node ID d5edb0ae8f2a48d61e435c3a0601141da31d965c
# Parent  8c40d4419e7066a18ca04b9bc19eb8c3a1c39654
1.12.2 Fix for segfault when delete/keep childs

diff -r 8c40d4419e70 -r d5edb0ae8f2a mapeditor.cpp
--- a/mapeditor.cpp	Thu Aug 07 14:41:17 2008 +0000
+++ b/mapeditor.cpp	Sun Oct 05 09:15:00 2008 +0000
@@ -3685,6 +3685,17 @@
 	if (bo)
 	{
 		par=(BranchObj*)(bo->getParObj());
+
+		// Don't use this on mapcenter
+		if (!par) return;
+
+		// Check if we have childs at all to keep
+		if (bo->countBranches()==0) 
+		{
+			deleteSelection();
+			return;
+		}
+
 		QPointF p=bo->getRelPos();
 		saveStateChangingPart(
 			bo->getParObj(),
diff -r 8c40d4419e70 -r d5edb0ae8f2a tex/vym.changelog
--- a/tex/vym.changelog	Thu Aug 07 14:41:17 2008 +0000
+++ b/tex/vym.changelog	Sun Oct 05 09:15:00 2008 +0000
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Oct  5 10:48:51 CEST 2008 - uwe
+
+- Version: 1.12.2
+- Bugfix: No more segfault for "delete & keep childs" on MapCenter
+
+-------------------------------------------------------------------
+Sun Jul 27 16:36:30 CEST 2008 - uwedr@suse.de
+
+- Version: 1.12.1
+
 -------------------------------------------------------------------
 Sun Jul 27 16:36:29 CEST 2008 - uwedr@suse.de
 
diff -r 8c40d4419e70 -r d5edb0ae8f2a version.h
--- a/version.h	Thu Aug 07 14:41:17 2008 +0000
+++ b/version.h	Sun Oct 05 09:15:00 2008 +0000
@@ -4,10 +4,10 @@
 #include <QString>
 
 #define __VYM_NAME "VYM"
-#define __VYM_VERSION "1.12.1"
+#define __VYM_VERSION "1.12.2"
 #define __VYM_CODENAME "Maintenance Update"
 //#define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2008-08-07"
+#define __VYM_BUILD_DATE "2008-10-05"
 
 
 bool checkVersion(const QString &);