ASAP::O: Exit quicker (and with explanation) if setup fails

2 files changed, 2 insertions, 0 deletions

diff --git a/src/im-asapo.h b/src/im-asapo.h
index ab68e1c2..e61ed530 100644
--- a/src/im-asapo.h
+++ b/src/im-asapo.h
@@ -61,6 +61,7 @@ static UNUSED struct im_asapo *im_asapo_connect(const char *endpoint,
                                                 const char *data_source,
                                                 const char *stream)
 {
+	ERROR("This installation of CrystFEL was compiled without ASAP::O support.\n");
 	return NULL;
 }
 
diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index 83d2f043..0e5dfef9 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -367,6 +367,7 @@ static int run_work(const struct index_args *iargs, Stream *st,
 		                              sb->asapo_stream);
 		if ( asapostuff == NULL ) {
 			ERROR("ASAP::O setup failed.\n");
+			sb->shared->should_shutdown = 1;
 			return 1;
 		}
 	}