'trigger_action' is blocking

benmaidel · Mar 21, 2017 · 65f129e · 65f129e
1 parent 9661651
commit 65f129e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cob_command_gui/src/command_gui_buttons/command_gui_buttons.py b/cob_command_gui/src/command_gui_buttons/command_gui_buttons.py
@@ -94,7 +94,7 @@ def CreateControlPanel(self):
 				elif button[1] == "move_base_rel":
 					buttons.append(self.CreateButton(button[0],self.sss.move_base_rel,component_name,button[2]))
 				elif button[1] == "trigger_action":
-					buttons.append(self.CreateButton(button[0],self.sss.trigger_action,component_name,button[2]))
+					buttons.append(self.CreateButton(button[0],self.sss.trigger_action,component_name,button[2],True))
 				elif button[1] == "trigger":
 					buttons.append(self.CreateButton(button[0],self.sss.trigger,component_name,button[2]))
 					if button[2] == "stop":
@@ -144,11 +144,11 @@ def CreateControlPanel(self):
 
 
 	## Creates one button with functionality
-	def CreateButton(self,button_name,function,component_name,parameter_name=None):
+	def CreateButton(self,button_name,function,component_name,parameter_name=None,blocking=False):
 		if parameter_name == None:
-			button = (button_name,function,(component_name,False))
+			button = (button_name,function,(component_name,blocking))
 		else:
-			button = (button_name,function,(component_name,parameter_name,False))
+			button = (button_name,function,(component_name,parameter_name,blocking))
 		return button
 
 	## Sorts a dictionary alphabetically