summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
authorRadomir Dopieralski <openstack@sheep.art.pl>2019-03-17 14:20:25 +0100
committerRadomir Dopieralski <openstack@sheep.art.pl>2019-03-19 09:20:05 +0100
commitd81db3bced68e828167c7fc363b232caa28bcd7a (patch)
treefcd965505a756ea040efd0c31839a6690752ac0e /shared-module
parenta50ee4f6503af0c6d0f62976a4aa2c1de0f694f1 (diff)
parent60f76941efabd579c28cddfd70218d6ef7c08067 (diff)
Merge branch 'master' of github.com:adafruit/circuitpython
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/displayio/__init__.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 546a46b1e..ced5b0fef 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -29,10 +29,8 @@ void displayio_refresh_displays(void) {
if (mp_hal_is_interrupted()) {
return;
}
- // Somehow reloads from the sdcard are being lost. So, cheat and reraise.
- // But don't re-raise if already pending.
- if (reload_requested && MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {
- mp_raise_reload_exception();
+ if (reload_requested) {
+ // Reload is about to happen, so don't redisplay.
return;
}