From 8fa61091702d473ae172da62256e323d53afe3e2 Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Thu, 20 Mar 2014 21:52:57 +0000
Subject: *** empty log message ***

---
 src/bltGrElemOp.C | 9 ++-------
 src/bltGrMarker.C | 5 +----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 52ad5ae..7047305 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -349,8 +349,6 @@ static void DestroyElement(Element* elemPtr)
   FreeDataValues(&elemPtr->x);
   FreeDataValues(&elemPtr->y);
 
-  (*elemPtr->procsPtr->destroyProc) (graphPtr, elemPtr);
-
   /* Remove it also from the element display list */
   if (elemPtr->link) {
     Blt_Chain_DeleteLink(graphPtr->elements.displayList, elemPtr->link);
@@ -366,12 +364,9 @@ static void DestroyElement(Element* elemPtr)
   if (elemPtr->obj.name)
     free((void*)(elemPtr->obj.name));
 
-  //  to be freed via Tk_FreeConfigOptions
-  //  if (elemPtr->label)
-  //    free((void*)(elemPtr->label));
-
   Tk_FreeConfigOptions((char*)elemPtr, elemPtr->optionTable, graphPtr->tkwin);
 
+  (*elemPtr->procsPtr->destroyProc) (graphPtr, elemPtr);
   free(elemPtr);
 }
 
@@ -1079,7 +1074,7 @@ static void FreeDataValues(ElemValues *valuesPtr)
     break;
   }
   if (valuesPtr->values) {
-    free(valuesPtr->values);
+    //    free(valuesPtr->values);
   }
   valuesPtr->values = NULL;
   valuesPtr->nValues = 0;
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index e910d5e..b86e629 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -299,10 +299,6 @@ static void DestroyMarker(Marker *markerPtr)
   if (markerPtr->ops->drawUnder)
     graphPtr->flags |= CACHE_DIRTY;
 
-  // Call the marker's type-specific deallocation routine. We do it first
-  // while all the marker fields are still valid.
-  (*markerPtr->classPtr->freeProc)(markerPtr);
-
   Blt_DeleteBindings(graphPtr->bindTable, markerPtr);
 
   if (markerPtr->obj.name)
@@ -317,6 +313,7 @@ static void DestroyMarker(Marker *markerPtr)
   Tk_FreeConfigOptions((char*)markerPtr->ops, markerPtr->optionTable,
 		       graphPtr->tkwin);
 
+  (*markerPtr->classPtr->freeProc)(markerPtr);
   free(markerPtr);
 }
 
-- 
cgit v0.12