half-fix logic issue with solo-isolate controls
git-svn-id: svn://localhost/ardour2/branches/3.0@7067 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
1ae1eeb257
commit
b092cfc216
@ -1074,9 +1074,14 @@ bool
|
|||||||
RouteUI::solo_isolate_button_release (GdkEventButton* ev)
|
RouteUI::solo_isolate_button_release (GdkEventButton* ev)
|
||||||
{
|
{
|
||||||
bool view = (solo_isolated_led->visual_state() != 0);
|
bool view = (solo_isolated_led->visual_state() != 0);
|
||||||
cerr << _route->name() << "button release, view is " << view << " set to " << !view << endl;
|
bool model = _route->solo_isolated();
|
||||||
_route->set_solo_isolated (!view, this);
|
|
||||||
cerr << "DONE with SSI\n";
|
/* called BEFORE the view has changed */
|
||||||
|
|
||||||
|
if (model == view) {
|
||||||
|
_route->set_solo_isolated (!view, this);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1090,7 +1095,14 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev)
|
|||||||
void
|
void
|
||||||
RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check)
|
RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check)
|
||||||
{
|
{
|
||||||
_route->set_solo_isolated (check->get_active(), this);
|
bool view = check->get_active();
|
||||||
|
bool model = _route->solo_isolated();
|
||||||
|
|
||||||
|
/* called AFTER the view has changed */
|
||||||
|
|
||||||
|
if (model != view) {
|
||||||
|
_route->set_solo_isolated (view, this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
Reference in New Issue
Block a user