Merge remote-tracking branch 'tuxbox/master'

* needs compile fixes
* needs additional tests, of course :-)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
346 changed files with 13372 additions and 6088 deletions

View File

@@ -2020,6 +2020,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
std::string text = "No transponders found for ";
text += name;
ShowHint(LOCALE_MESSAGEBOX_ERROR, text.c_str(), 450, 2);
delete selector;
return menu_return::RETURN_REPAINT;
}