From 45d3f67ec9a60029f7decc0f22056eabb2e489ef Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 11 Apr 2018 23:58:15 +0200 Subject: [PATCH] src/gui/osd_setup.cpp: use CMenuForwarder instead CMenuDForwarder This should avoid possible segfaults when user is calling color setup. This behavior was observed if start wizard has been completed and after that user wants to change color settings. If target object is a singelton, this should not be an issue. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/84612b795c3e21d26f9744aee0a080747254fca3 Author: Thilo Graf Date: 2018-04-11 (Wed, 11 Apr 2018) ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index eb997466e..6948cec2d 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -787,7 +787,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) { menu_colors->addIntroItems(LOCALE_COLORMENU_MENUCOLORS); - CMenuForwarder * mf = new CMenuDForwarder(LOCALE_COLORMENU_THEMESELECT, true, NULL, CThemes::getInstance(), NULL, CRCInput::RC_red); + CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_THEMESELECT, true, NULL, CThemes::getInstance(), NULL, CRCInput::RC_red); mf->setHint("", LOCALE_MENU_HINT_THEME); menu_colors->addItem(mf);