mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/personalize.cpp: fix memleak, fix warnings

Browse Source 
Origin commit data
------------------
Commit: 6b58f32c48
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
This commit is contained in:
[CST] Focus
2013-10-25 13:53:36 +04:00
parent e091a84f2b
commit ec6c5e7974
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/personalize.cpp
View File

@@ -290,7 +290,6 @@ int CPersonalizeGui::ShowPersonalizationMenu()
CPINChangeWidget *pinChangeWidget = NULL; CPINChangeWidget *pinChangeWidget = NULL;
if (!g_settings.easymenu && show_pin_setup) if (!g_settings.easymenu && show_pin_setup)
ShowPinSetup(pMenu, pinChangeWidget); ShowPinSetup(pMenu, pinChangeWidget);
printf("CPersonalizeGui::ShowPinSetup: pinChangeWidget %x\n", pinChangeWidget);
int res; int res;
if (g_settings.easymenu) { if (g_settings.easymenu) {
@@ -307,7 +306,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
const neutrino_msg_t key = (count == 0) ? CRCInput::RC_red : const neutrino_msg_t key = (count == 0) ? CRCInput::RC_red :
(count == 1) ? CRCInput::RC_green : (count == 1) ? CRCInput::RC_green :
(count == 2) ? CRCInput::RC_yellow : (count == 2) ? CRCInput::RC_yellow :
(count == 3) ? CRCInput::RC_blue : NULL; (count == 3) ? CRCInput::RC_blue : CRCInput::RC_nokey;
count++; count++;
string itm_name = g_Locale->getText(v_item[j].locale_name); string itm_name = g_Locale->getText(v_item[j].locale_name);
itm_name += " "; itm_name += " ";
@@ -370,7 +369,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
} }
//init pin setup dialog //init pin setup dialog
void CPersonalizeGui::ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget) void CPersonalizeGui::ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget * &pin_widget)
{ {
pin_widget = new CPINChangeWidget(LOCALE_PERSONALIZE_PINCODE, g_settings.personalize_pincode, 4, LOCALE_PERSONALIZE_PINHINT); pin_widget = new CPINChangeWidget(LOCALE_PERSONALIZE_PINCODE, g_settings.personalize_pincode, 4, LOCALE_PERSONALIZE_PINHINT);

2
src/gui/personalize.h
View File

@@ -164,7 +164,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
int ShowPersonalizationMenu(); int ShowPersonalizationMenu();
int ShowMenuOptions(const int& menu); int ShowMenuOptions(const int& menu);
void ShowHelpPersonalize(); void ShowHelpPersonalize();
void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget); void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget * &pin_widget);
void ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu); void ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu);
void ShowPluginMenu(CMenuWidget* p_widget); void ShowPluginMenu(CMenuWidget* p_widget);
void ShowPreverredKeySetup(CMenuWidget* p_widget); void ShowPreverredKeySetup(CMenuWidget* p_widget);