From 2fb0399255dd75a494e3c9c129da89f44a3e56c7 Mon Sep 17 00:00:00 2001 From: martii Date: Fri, 16 Aug 2013 20:22:37 +0200 Subject: [PATCH] moviebrowser/yt history: use a less collision-prone action key for clearing the history Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1cabec4acea9ce19a0beeaeb6d0c596334179164 Author: martii Date: 2013-08-16 (Fri, 16 Aug 2013) --- src/gui/moviebrowser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 0da729f25..f7f48aa24 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3929,7 +3929,7 @@ int CYTHistory::exec(CMenuTarget* parent, const std::string &actionKey) if (parent) parent->hide(); CMenuWidget* m = new CMenuWidget(LOCALE_MOVIEBROWSER_YT_HISTORY, NEUTRINO_ICON_MOVIEPLAYER, width); - m->addKey(CRCInput::RC_spkr, this, "clear"); + m->addKey(CRCInput::RC_spkr, this, "clearYThistory"); m->setSelected(selected); m->addItem(GenericMenuSeparator); m->addItem(GenericMenuBack); @@ -3942,7 +3942,7 @@ int CYTHistory::exec(CMenuTarget* parent, const std::string &actionKey) delete m; return menu_return::RETURN_REPAINT; } - if (actionKey == "clear") { + if (actionKey == "clearYThistory") { settings->ytsearch_history.clear(); settings->ytsearch_history_size = 0; return menu_return::RETURN_EXIT;