do not crash if an unknown action is used by Mackie Control support
This commit is contained in:
parent
78c32dc2fc
commit
91ed9840d0
@ -639,7 +639,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
|
|||||||
row[function_key_columns.plain] = action;
|
row[function_key_columns.plain] = action;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
act = ActionManager::get_action (action.c_str());
|
act = ActionManager::get_action (action.c_str(), false);
|
||||||
if (act) {
|
if (act) {
|
||||||
row[function_key_columns.plain] = act->get_label();
|
row[function_key_columns.plain] = act->get_label();
|
||||||
} else {
|
} else {
|
||||||
@ -663,7 +663,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
|
|||||||
/* Probably a key alias */
|
/* Probably a key alias */
|
||||||
row[function_key_columns.shift] = action;
|
row[function_key_columns.shift] = action;
|
||||||
} else {
|
} else {
|
||||||
act = ActionManager::get_action (action.c_str());
|
act = ActionManager::get_action (action.c_str(), false);
|
||||||
if (act) {
|
if (act) {
|
||||||
row[function_key_columns.shift] = act->get_label();
|
row[function_key_columns.shift] = act->get_label();
|
||||||
} else {
|
} else {
|
||||||
@ -681,7 +681,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
|
|||||||
/* Probably a key alias */
|
/* Probably a key alias */
|
||||||
row[function_key_columns.control] = action;
|
row[function_key_columns.control] = action;
|
||||||
} else {
|
} else {
|
||||||
act = ActionManager::get_action (action.c_str());
|
act = ActionManager::get_action (action.c_str(), false);
|
||||||
if (act) {
|
if (act) {
|
||||||
row[function_key_columns.control] = act->get_label();
|
row[function_key_columns.control] = act->get_label();
|
||||||
} else {
|
} else {
|
||||||
@ -698,7 +698,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
|
|||||||
/* Probably a key alias */
|
/* Probably a key alias */
|
||||||
row[function_key_columns.option] = action;
|
row[function_key_columns.option] = action;
|
||||||
} else {
|
} else {
|
||||||
act = ActionManager::get_action (action.c_str());
|
act = ActionManager::get_action (action.c_str(), false);
|
||||||
if (act) {
|
if (act) {
|
||||||
row[function_key_columns.option] = act->get_label();
|
row[function_key_columns.option] = act->get_label();
|
||||||
} else {
|
} else {
|
||||||
@ -715,7 +715,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
|
|||||||
/* Probably a key alias */
|
/* Probably a key alias */
|
||||||
row[function_key_columns.cmdalt] = action;
|
row[function_key_columns.cmdalt] = action;
|
||||||
} else {
|
} else {
|
||||||
act = ActionManager::get_action (action.c_str());
|
act = ActionManager::get_action (action.c_str(), false);
|
||||||
if (act) {
|
if (act) {
|
||||||
row[function_key_columns.cmdalt] = act->get_label();
|
row[function_key_columns.cmdalt] = act->get_label();
|
||||||
} else {
|
} else {
|
||||||
@ -728,7 +728,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
|
|||||||
if (action.empty()) {
|
if (action.empty()) {
|
||||||
row[function_key_columns.shiftcontrol] = defstring;
|
row[function_key_columns.shiftcontrol] = defstring;
|
||||||
} else {
|
} else {
|
||||||
act = ActionManager::get_action (action.c_str());
|
act = ActionManager::get_action (action.c_str(), false);
|
||||||
if (act) {
|
if (act) {
|
||||||
row[function_key_columns.shiftcontrol] = act->get_label();
|
row[function_key_columns.shiftcontrol] = act->get_label();
|
||||||
} else {
|
} else {
|
||||||
@ -760,7 +760,7 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str());
|
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str(), false);
|
||||||
|
|
||||||
if (act || remove) {
|
if (act || remove) {
|
||||||
/* update visible text, using string supplied by
|
/* update visible text, using string supplied by
|
||||||
|
Loading…
Reference in New Issue
Block a user