From: alx <alx@fastestcode.org>
Date: Tue, 2 Apr 2013 20:44:14 +0000 (+0200)
Subject: Fixed dtpad server crash when closing editor window associated with primary document
X-Git-Tag: 2.2.0d~7^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=86e5dc1f108d3cb8d8a4c339061a0316f9772a12;p=oweals%2Fcde.git

Fixed dtpad server crash when closing editor window associated with primary document
---

diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 402e688e..ff18cf71 100644
--- a/cde/programs/dtpad/main.c
+++ b/cde/programs/dtpad/main.c
@@ -633,6 +633,11 @@ CreateFirstPad(
 	initialServerResources = pPad->xrdb;
 	initialServerResources.server = False; /* so window will be mapped */ 
 	initialServerGeometry = pPad->geometry;
+	if(pPad->xrdb.workspaceList)
+		pPad->xrdb.workspaceList = strdup(pPad->xrdb.workspaceList);
+	if(pPad->xrdb.session)
+		pPad->xrdb.session = strdup(pPad->xrdb.session);
+	pPad->geometry = strdup(pPad->geometry);
     }
 
     /* Set some initial Editor instance values */
@@ -1677,7 +1682,6 @@ RestoreInitialServerResources(
 	XtFree(pPad->geometry );
 
     pPad->xrdb = initialServerResources;
-    pPad->geometry = initialServerGeometry;
 
     /* -----> duplicate resource strings */
     if (initialServerResources.workspaceList != (char *)NULL)