mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-17 10:23:37 +02:00
COsdSetup: ensure reset of channellist modules after any changed osd settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf5d138508
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -307,8 +307,6 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
if (fs_x != g_settings.font_scaling_x || fs_y != g_settings.font_scaling_y) {
|
if (fs_x != g_settings.font_scaling_x || fs_y != g_settings.font_scaling_y) {
|
||||||
printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", g_settings.font_scaling_x, g_settings.font_scaling_y);
|
printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", g_settings.font_scaling_x, g_settings.font_scaling_y);
|
||||||
CNeutrinoApp::getInstance()->SetupFonts(CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT | CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT_INST | CNeutrinoFonts::FONTSETUP_DYN_FONT);
|
CNeutrinoApp::getInstance()->SetupFonts(CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT | CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT_INST | CNeutrinoFonts::FONTSETUP_DYN_FONT);
|
||||||
if (CNeutrinoApp::getInstance()->channelList)
|
|
||||||
CNeutrinoApp::getInstance()->channelList->ResetModules(); //force re init of all modules
|
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -405,6 +403,10 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
|
|
||||||
res = showOsdSetup();
|
res = showOsdSetup();
|
||||||
|
|
||||||
|
//ensure reset of channellist modules after any changed osd settings
|
||||||
|
if (CNeutrinoApp::getInstance()->channelList)
|
||||||
|
CNeutrinoApp::getInstance()->channelList->ResetModules();
|
||||||
|
|
||||||
//return menu_return::RETURN_REPAINT;
|
//return menu_return::RETURN_REPAINT;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user