13
0

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:
Robin Gareus 2019-01-16 01:17:52 +01:00
parent 8b71967be9
commit cd70c6bda5
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04

View File

@ -556,7 +556,7 @@ US2400ProtocolGUI::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(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.plain] = act->get_label(); row[function_key_columns.plain] = act->get_label();
} else { } else {