mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 07:51:19 +02:00
Revert "COsdSetup: kill instance of osd_menu_colors"
This reverts commit 14124c7dd6
.
With this commit were crashes are to be expected. If here is an issue,
we should fix it with another solution.
This commit is contained in:
@@ -569,11 +569,10 @@ int COsdSetup::showOsdSetup()
|
|||||||
osd_menu->addIntroItems(LOCALE_MAINSETTINGS_OSD);
|
osd_menu->addIntroItems(LOCALE_MAINSETTINGS_OSD);
|
||||||
|
|
||||||
//item menu colors
|
//item menu colors
|
||||||
if (osd_menu_colors)
|
if (osd_menu_colors == NULL){
|
||||||
delete osd_menu_colors;
|
|
||||||
osd_menu_colors = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_MENUCOLORS);
|
osd_menu_colors = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_MENUCOLORS);
|
||||||
showOsdMenueColorSetup(osd_menu_colors);
|
showOsdMenueColorSetup(osd_menu_colors);
|
||||||
|
}
|
||||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, osd_menu_colors, NULL, CRCInput::RC_red);
|
CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, osd_menu_colors, NULL, CRCInput::RC_red);
|
||||||
mf->setHint("", LOCALE_MENU_HINT_COLORS);
|
mf->setHint("", LOCALE_MENU_HINT_COLORS);
|
||||||
osd_menu->addItem(mf);
|
osd_menu->addItem(mf);
|
||||||
|
Reference in New Issue
Block a user