Fix ambiguity introduced in 91ed9840d
(bool) false == 0 == (const char*) NULL error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: actions.h:92: note: candidate 1: Glib::RefPtr<Gtk::Action> ActionManager::get_action(const char*, const char*, bool) actions.h:91: note: candidate 2: Glib::RefPtr<Gtk::Action> ActionManager::get_action(const std::string&, bool)
This commit is contained in:
parent
8b71967be9
commit
cd70c6bda5
@ -556,7 +556,7 @@ US2400ProtocolGUI::refresh_function_key_editor ()
|
||||
row[function_key_columns.plain] = action;
|
||||
} else {
|
||||
|
||||
act = ActionManager::get_action (action.c_str(), false);
|
||||
act = ActionManager::get_action (action, false);
|
||||
if (act) {
|
||||
row[function_key_columns.plain] = act->get_label();
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user