Merge branch 'load_action'

[perso/Immae/Projets/Python/MusicSampler.git] / music_sampler / app_blocks / actionlist.py

diff --git a/music_sampler/app_blocks/actionlist.py b/music_sampler/app_blocks/actionlist.py
index f48072f92962d34deb5ebc1549c843ad0a86af97..59315de567a76e7af155c978820850f1656c4465 100644 (file)
--- a/music_sampler/app_blocks/actionlist.py
+++ b/music_sampler/app_blocks/actionlist.py
@@ -4,6 +4,8 @@ from kivy.uix.relativelayout import RelativeLayout
 from kivy.properties import ListProperty, StringProperty
 from ..lock import Lock
 
+from kivy.clock import mainthread
+
 __all__ = ["ActionList",
         "ActionListIcons", "ActionListIcon",
         "ActionListDescriptions", "ActionListDescription"]
@@ -14,6 +16,7 @@ class ActionList(RelativeLayout):
     action_title = StringProperty("")
     action_list = ListProperty([])
 
+    @mainthread
     def update_list(self, key, action_descriptions):
         if key.repeat_delay > 0:
             self.action_title = _(