From 5da51e138cd57d06cb320e5b6cb2e6ddfe365b88 Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 21 Jul 2021 05:14:31 -0400 Subject: [PATCH] intro: don't tolerate drawing failures --- src/demo/intro.c | 7 ++++++- src/demo/xray.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/demo/intro.c b/src/demo/intro.c index 786ecebbe..6bd99184c 100644 --- a/src/demo/intro.c +++ b/src/demo/intro.c @@ -244,9 +244,14 @@ int intro(struct notcurses* nc){ if(!on){ if(notcurses_check_pixel_support(nc) && notcurses_canopen_images(nc)){ on = orcashow(nc, rows, cols); + if(on == NULL){ + return -1; + } } }else{ - orcaride(nc, on, expected_iter); + if(orcaride(nc, on, expected_iter)){ + return -1; + } } int err; if( (err = animate(nc, ncp, &flipmode)) ){ diff --git a/src/demo/xray.c b/src/demo/xray.c index dc1f6d441..a9e2c4915 100644 --- a/src/demo/xray.c +++ b/src/demo/xray.c @@ -180,7 +180,7 @@ int xray_demo(struct notcurses* nc){ marsh.next_frame = 0; marsh.last_frame_rendered = -1; marsh.lplane = NULL; - marsh.dm = notcurses_check_pixel_support(nc) < 1 ? 0.5 * delaymultiplier : 0; + marsh.dm = notcurses_check_pixel_support(nc) ? 0 : 0.5 * delaymultiplier; int ret = -1; // FIXME need do something about SIGINT here, which can leave us locked up if(pthread_create(&tid1, NULL, xray_thread, NULL)){