From d70fc9fa2505d7571957402c8f630af303db04bc Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sat, 17 Apr 2010 15:20:48 +0300 Subject: [PATCH] disable manual start/stop of a2j brdige when ladish is available. The a2j script as app should be used instead --- lib/laditools/ladimenu.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/laditools/ladimenu.py b/lib/laditools/ladimenu.py index 339ebe5..05e37c0 100644 --- a/lib/laditools/ladimenu.py +++ b/lib/laditools/ladimenu.py @@ -316,10 +316,13 @@ class manager: menu_items.append((gtk.ImageMenuItem("Reactivate JACK"), self.on_menu_command, self.jack_reactivate)) menu_items.append((gtk.SeparatorMenuItem(), None, None)) if self.a2j_is_available(): - if not self.a2j_is_started(): - menu_items.append((gtk.ImageMenuItem("Start A2J bridge"), self.on_menu_command, self.a2j_start)) - else: - menu_items.append((gtk.ImageMenuItem("Stop A2J bridge"), self.on_menu_command, self.a2j_stop)) + # when a2jmidid is used in used with ladish, a2j script should be used + # for managing bridge "active" lifetime + if not self.ladish_is_available(): + if not self.a2j_is_started(): + menu_items.append((gtk.ImageMenuItem("Start A2J bridge"), self.on_menu_command, self.a2j_start)) + else: + menu_items.append((gtk.ImageMenuItem("Stop A2J bridge"), self.on_menu_command, self.a2j_stop)) menu_items.append((gtk.ImageMenuItem("Reactivate A2J"), self.on_menu_command, self.a2j_reactivate)) menu_items.append((gtk.SeparatorMenuItem(), None, None)) menu_items.append((gtk.ImageMenuItem("Quit"), self.on_menu_command, gtk.main_quit))