Show stream

1 files changed, 9 insertions, 13 deletions

diff --git a/crystfel-demo.c b/crystfel-demo.c
index 2686e2f..365dd40 100644
--- a/crystfel-demo.c
+++ b/crystfel-demo.c
@@ -124,7 +124,7 @@ gint examine_geom_files(GtkWidget *widget, struct crystfeldemo *demo)
 	}
 
 	demo->examine_raw_files = g_subprocess_new(G_SUBPROCESS_FLAGS_NONE,
-	           &error, "sh",
+	           &error,
 	           "/home/taw/crystfel-demo/files/random-image",
 	           "/home/taw/crystfel-demo/files/files.lst",
 	           "--geometry=/home/taw/crystfel-demo/files/5HT2B.geom",
@@ -140,20 +140,15 @@ gint examine_geom_files(GtkWidget *widget, struct crystfeldemo *demo)
 gint show_stream(GtkWidget *widget, struct crystfeldemo *demo)
 {
 	GError *error = NULL;
+	GSubprocess *sub;
 
-	if ( demo->examine_raw_files != NULL ) {
-		printf("Already running!\n");
-		return 0;
-	}
+	sub = g_subprocess_new(G_SUBPROCESS_FLAGS_NONE,
+	                       &error, "xfce4-terminal",
+	                       "-x", "sh", "-c",
+	                       "less ${CRYSTFEL_DEMO_FILES}/nocell.stream",
+	                       NULL);
 
-	demo->examine_raw_files = g_subprocess_new(G_SUBPROCESS_FLAGS_NONE,
-	           &error, "xfce4-terminal",
-	           "-e",
-	           "less",
-	           "/home/taw/crystfel-demo/files/nocell.stream",
-	           NULL);
-
-	if ( demo->examine_raw_files == NULL ) {
+	if ( sub == NULL ) {
 		printf("Failed to start demo process\n");
 	}
 	return 0;
@@ -204,6 +199,7 @@ int main(int argc, char *argv[])
 	if ( change_to_tempdir() ) return 1;
 
 	demo.examine_raw_files = NULL;
+	demo.check_peak_detection = NULL;
 
 	gtk_init(&argc, &argv);
 	builder = gtk_builder_new_from_resource("/de/desy/crystfel-demo/crystfel-demo.glade");