diff options
| author | wr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-02-11 09:40:09 +0000 |
|---|---|---|
| committer | wr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-02-11 09:40:09 +0000 |
| commit | 0fbbb6071648d47c75d14eb1075bf6f5c85349cc (patch) | |
| tree | 14ab569569e235f91773857784e711563d5e0640 /muggle-plugin/vdr_menu.c | |
| parent | c17ecbd260b3304b60fedfa70999f2eccabb668d (diff) | |
| download | vdr-plugin-muggle-0fbbb6071648d47c75d14eb1075bf6f5c85349cc.tar.gz vdr-plugin-muggle-0fbbb6071648d47c75d14eb1075bf6f5c85349cc.tar.bz2 | |
fix many memory leaks, add missing copy constructor to mgOrder
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@478 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin/vdr_menu.c')
| -rw-r--r-- | muggle-plugin/vdr_menu.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c index 5d3d1cd..d37b899 100644 --- a/muggle-plugin/vdr_menu.c +++ b/muggle-plugin/vdr_menu.c @@ -269,9 +269,10 @@ mgMainMenu::SaveState() mgMainMenu::mgMainMenu ():cOsdMenu ("",25) { m_Status = new mgStatus(this); - m_message = NULL; - moveselection = NULL; - external_commands = NULL; + m_message = 0; + moveselection = 0; + m_root = 0; + external_commands = 0; queue_playing=false; instant_playing=false; play_collection = tr("play"); @@ -331,14 +332,14 @@ mgMainMenu::mgMainMenu ():cOsdMenu ("",25) UseNormalSelection (); unsigned int posi = selection()->gotoPosition(); LoadExternalCommands(); // before AddMenu() - mgMenu *root = new mgTree; - root->TreeRedAction = mgActions(nmain.getuint("TreeRedAction")); - root->TreeGreenAction = mgActions(nmain.getuint("TreeGreenAction")); - root->TreeYellowAction = mgActions(nmain.getuint("TreeYellowAction")); - root->CollRedAction = mgActions(nmain.getuint("CollRedAction")); - root->CollGreenAction = mgActions(nmain.getuint("CollGreenAction")); - root->CollYellowAction = mgActions(nmain.getuint("CollYellowAction")); - AddMenu (root,posi); + m_root = new mgTree; + m_root->TreeRedAction = mgActions(nmain.getuint("TreeRedAction")); + m_root->TreeGreenAction = mgActions(nmain.getuint("TreeGreenAction")); + m_root->TreeYellowAction = mgActions(nmain.getuint("TreeYellowAction")); + m_root->CollRedAction = mgActions(nmain.getuint("CollRedAction")); + m_root->CollGreenAction = mgActions(nmain.getuint("CollGreenAction")); + m_root->CollYellowAction = mgActions(nmain.getuint("CollYellowAction")); + AddMenu (m_root,posi); //SetCurrent (Get (posi)); @@ -425,8 +426,11 @@ mgMainMenu::LoadExternalCommands() mgMainMenu::~mgMainMenu() { delete m_Status; - if (moveselection) - delete moveselection; + delete moveselection; + delete m_root; + delete external_commands; + for (unsigned int i=0;i<orders.size();i++) + delete orders[i]; } void |