From 14dd96829ed69a7f9635ba4cbad91472b635dc3b Mon Sep 17 00:00:00 2001
From: taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>
Date: Tue, 4 Sep 2007 16:40:21 +0000
Subject: Step through predicted patterns, one-by-one

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@113 bf6ca9ba-c028-0410-8290-897cf20841d1
---
 src/imagedisplay.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/imagedisplay.c')

diff --git a/src/imagedisplay.c b/src/imagedisplay.c
index ae2f4b8..cfb0c74 100644
--- a/src/imagedisplay.c
+++ b/src/imagedisplay.c
@@ -118,9 +118,23 @@ void imagedisplay_put_data(ImageDisplay *imagedisplay, ImageRecord imagerecord)
 
 }
 
+void imagedisplay_clear_circles(ImageDisplay *imagedisplay) {
+	
+	ImageDisplayMark *cur;
+	
+	cur = imagedisplay->marks;
+	while ( cur ) {
+		ImageDisplayMark *next = cur->next;
+		free(cur);
+		cur = next;
+	}
+	imagedisplay->marks = NULL;
+	
+}
+
 static void imagedisplay_destroyed(GtkWidget *widget, ImageDisplay *imagedisplay) {
 
-	ImageDisplayMark *cur;
+	imagedisplay_clear_circles(imagedisplay);
 	
 	if ( imagedisplay->flags & IMAGEDISPLAY_QUIT_IF_CLOSED ) {
 		gtk_exit(0);
@@ -130,13 +144,6 @@ static void imagedisplay_destroyed(GtkWidget *widget, ImageDisplay *imagedisplay
 	g_object_unref(G_OBJECT(imagedisplay->gc_tiltaxis));
 	g_object_unref(G_OBJECT(imagedisplay->gc_marks));
 
-	cur = imagedisplay->marks;
-	while ( cur ) {
-		ImageDisplayMark *next = cur->next;
-		free(cur);
-		cur = next;
-	}
-	
 	free(imagedisplay);
 	
 }
-- 
cgit v1.2.3