From 9664ce0a86b4f25c0bb9ebac6abd2154943d4ec1 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 25 Jun 2019 20:44:57 +0200 Subject: [PATCH] moviebrowser: fix possible memleak in initSeriesMenu() thx satbaby for hints Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/90406340a4508245abb2b02979525743f1abceae Author: Thilo Graf Date: 2019-06-25 (Tue, 25 Jun 2019) --- src/gui/moviebrowser/mb.cpp | 9 ++++----- src/gui/moviebrowser/mb.h | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index b95b775c7..7d2ccb2d9 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include @@ -3433,12 +3432,11 @@ void CMovieBrowser::initBookMarkMenu(CMenuWidget *BookmarkMenu, MI_MOVIE_INFO* m } #define MAX_STRING 30 -void CMovieBrowser::initSeriesMenu(CMenuWidget *SeriesMenu, MI_MOVIE_INFO* movie_info) +void CMovieBrowser::initSeriesMenu(CMenuWidget *SeriesMenu, MI_MOVIE_INFO* movie_info, CKeyboardInput *SerieUserInput) { SeriesMenu->addIntroItems(LOCALE_MOVIEBROWSER_SERIE_HEAD); - CKeyboardInput *serieUserInput = new CKeyboardInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, MAX_STRING); //TODO: hints - SeriesMenu->addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SERIE_NAME, true, movie_info->serieName, serieUserInput)); + SeriesMenu->addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SERIE_NAME, true, movie_info->serieName, SerieUserInput)); SeriesMenu->addItem(GenericMenuSeparatorLine); for (unsigned int li = 0; li < m_vHandleSerienames.size(); li++) @@ -3484,7 +3482,8 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) // init series menu CMenuWidget serieMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); - initSeriesMenu(&serieMenu, movie_info); + CKeyboardInput serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, MAX_STRING); //TODO: hints + initSeriesMenu(&serieMenu, movie_info, &serieUserInput); // init update movie info menu CMenuWidget movieInfoMenuUpdate(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index a1bf9d869..af5fa972e 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -60,6 +60,7 @@ #include #include #include +#include #include #define MAX_NUMBER_OF_BOOKMARK_ITEMS MI_MOVIE_BOOK_USER_MAX // we just use the same size as used in Movie info (MAX_NUMBER_OF_BOOKMARK_ITEMS is used for the number of menu items) @@ -349,7 +350,7 @@ class CMovieBrowser : public CMenuTarget, public CProgressSignals ///// Menu //////////////////////////////////// bool showMenu(bool calledExternally = false); void initBookMarkMenu(CMenuWidget *BookmarkMenu, MI_MOVIE_INFO* movie_info, CIntInput* BookStartIntInput, CIntInput* BookLastIntInput, CIntInput* BookEndIntInput); - void initSeriesMenu(CMenuWidget *SeriesMenu, MI_MOVIE_INFO* movie_info); + void initSeriesMenu(CMenuWidget *SeriesMenu, MI_MOVIE_INFO* movie_info, CKeyboardInput *SerieUserInput); void initUpdateMovieInfoMenu(CMenuWidget *MovieInfoMenuUpdate); void initParentalMenu(CMenuWidget *ParentalMenu); void initOptionsDirMenu(CMenuWidget *OptionsMenuDir, std::vector& v_notifiers);