Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox

Origin commit data
------------------
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
This commit is contained in:
gixxpunk
2017-04-26 11:17:46 +02:00
24 changed files with 72 additions and 42 deletions

View File

@@ -324,6 +324,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
memset(window_size_value, 0, sizeof(window_size_value));
snprintf(window_size_value, sizeof(window_size_value), "%d / %d", g_settings.window_width, g_settings.window_height);
mfWindowSize->setOption(window_size_value);
CNeutrinoApp::getInstance()->channelList->ResetModules();
break;
} else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) {
g_settings.window_width = old_window_width;