From 1748000e4d8604f74fa856f85f94026d3e55efb4 Mon Sep 17 00:00:00 2001 From: "Kwabena W. Agyeman" Date: Tue, 17 Oct 2017 01:14:57 -0400 Subject: [PATCH] Use special version of nlr_raise again. --- src/micropython | 2 +- src/omv/fb_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/micropython b/src/micropython index cc69b65d7..2722bf352 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit cc69b65d7e2e15af3d4e7e4640c2b8c004a11987 +Subproject commit 2722bf352936d2984444a6efaecb67e210404547 diff --git a/src/omv/fb_alloc.c b/src/omv/fb_alloc.c index 147be34ea..09a3951ed 100644 --- a/src/omv/fb_alloc.c +++ b/src/omv/fb_alloc.c @@ -36,7 +36,7 @@ void fb_alloc_mark() // Check if allocation overwrites the framebuffer pixels if (new_pointer < (char *) MAIN_FB_PIXELS()) { - nlr_raise(mp_obj_new_exception_msg(&mp_type_MemoryError, "FB Alloc Collision!!!")); + nlr_raise_for_fb_alloc_mark(mp_obj_new_exception_msg(&mp_type_MemoryError, "FB Alloc Collision!!!")); } // fb_alloc does not allow regions which are a size of 0 to be alloced,