This should have been in the previous commit

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@256 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 11 insertions, 3 deletions

diff --git a/src/displaywindow.c b/src/displaywindow.c
index e09be2d..434508c 100644
--- a/src/displaywindow.c
+++ b/src/displaywindow.c
@@ -463,6 +463,9 @@ void displaywindow_update_imagestack(DisplayWindow *dw) {
 	ImageRecord *image;
 	GtkWidget *d;
 	
+	/* Don't attempt to update the image stack if the stack doesn't exist */
+	if ( dw->ctx->images->n_images == 0 ) return;
+	
 	imagedisplay_clear_marks(dw->stack);
 	imagedisplay_put_data(dw->stack, dw->ctx->images->images[dw->cur_image]);
 		
@@ -603,9 +606,14 @@ DisplayWindow *displaywindow_open(ControlContext *ctx) {
 	g_signal_connect(GTK_OBJECT(dw->drawing_area), "motion_notify_event", G_CALLBACK(displaywindow_gl_motion_notify), dw);
 	g_signal_connect(GTK_OBJECT(dw->drawing_area), "destroy", G_CALLBACK(displaywindow_gl_destroyed), dw);
 	
-	dw->stack = imagedisplay_new_nowindow(ctx->images->images[dw->cur_image], IMAGEDISPLAY_SHOW_TILT_AXIS | IMAGEDISPLAY_SHOW_CENTRE, NULL, NULL, NULL);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dw->stack->vbox, gtk_label_new("Image Stack"));
-	displaywindow_update_imagestack(dw);
+	if ( ctx->images->n_images > 0 ) {
+		dw->stack = imagedisplay_new_nowindow(ctx->images->images[dw->cur_image],
+				IMAGEDISPLAY_SHOW_TILT_AXIS | IMAGEDISPLAY_SHOW_CENTRE, NULL, NULL, NULL);
+		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dw->stack->vbox, gtk_label_new("Image Stack"));
+		displaywindow_update_imagestack(dw);
+	} else {
+		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), gtk_label_new("No Images to Display"), gtk_label_new("Image Stack"));
+	}
 	
 	displaywindow_enable_cell_functions(dw, FALSE);
 	displaywindow_update_dirax(ctx, dw);