Kill trap threads before memory is freed.

diff --git a/autoconf.cpp b/autoconf.cpp
index c5a507b43b32da448108343ac4687ac394585018..68b24683e3e539b868e94bd15213ba3da56d1c49 100644 (file)
--- a/autoconf.cpp
+++ b/autoconf.cpp
@@ -533,7 +533,6 @@ void rtarea_init_mem (void)
 void rtarea_free(void)
 {
        mapped_free(&rtarea_bank);
-       free_traps();
 }
 
 void rtarea_init(void)

diff --git a/devices.cpp b/devices.cpp
index 2428544a4921874e153bbc7cffd0b0677e13d366..5a970eeb6599f95a5ff8fc8d15c89d39eed182e5 100644 (file)
--- a/devices.cpp
+++ b/devices.cpp
@@ -295,6 +295,7 @@ void reset_all_systems (void)
 
 void do_leave_program (void)
 {
+       free_traps();
        sampler_free ();
        graphics_leave ();
        inputdevice_close ();