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

network_setup: fix memleak

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9cd9b13e2c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-01-22 (Wed, 22 Jan 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2020-01-22 19:00:24 +01:00
parent 6f2b769c54
commit d285a1ef1f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/network_setup.cpp
View File

@@ -46,7 +46,6 @@
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#include <gui/network_service.h> #include <gui/network_service.h>
#include <gui/netfs_setup.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@@ -363,7 +362,8 @@ int CNetworkSetup::showNetworkSetup()
mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue); mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT); mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT);
networkSettings->addItem(mf); networkSettings->addItem(mf);
showNetworkNFSMounts(&networkmounts); CNETFSMountGui *netfsMountGui = new CNETFSMountGui();
showNetworkNFSMounts(&networkmounts,netfsMountGui);
#endif #endif
//proxyserver submenu //proxyserver submenu
@@ -389,6 +389,7 @@ int CNetworkSetup::showNetworkSetup()
dhcpDisable.Clear(); dhcpDisable.Clear();
wlanEnable.Clear(); wlanEnable.Clear();
delete netfsMountGui;
delete networkSettings; delete networkSettings;
delete sectionsdConfigNotifier; delete sectionsdConfigNotifier;
return ret; return ret;
@@ -419,7 +420,7 @@ void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp)
} }
#ifdef ENABLE_GUI_MOUNT #ifdef ENABLE_GUI_MOUNT
void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs) void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs,CNETFSMountGui *netfsMountGui)
{ {
menu_nfs->addIntroItems(LOCALE_NETWORKMENU_MOUNT); menu_nfs->addIntroItems(LOCALE_NETWORKMENU_MOUNT);
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_NFS_MOUNT , true, NULL, new CNFSMountGui(), NULL, CRCInput::RC_red); CMenuForwarder * mf = new CMenuDForwarder(LOCALE_NFS_MOUNT , true, NULL, new CNFSMountGui(), NULL, CRCInput::RC_red);
@@ -431,7 +432,6 @@ void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs)
menu_nfs->addItem(GenericMenuSeparatorLine); menu_nfs->addItem(GenericMenuSeparatorLine);
CNETFSMountGui *netfsMountGui = new CNETFSMountGui();
const char *used_fstab = netfsMountGui->fstabPath.c_str(); const char *used_fstab = netfsMountGui->fstabPath.c_str();
const char *used_autonet = netfsMountGui->autoPath.c_str(); const char *used_autonet = netfsMountGui->autoPath.c_str();

3
src/gui/network_setup.h
View File

@@ -35,6 +35,7 @@
#include <system/setting_helpers.h> #include <system/setting_helpers.h>
#include <system/configure_network.h> #include <system/configure_network.h>
#include <gui/netfs_setup.h>
#include <string> #include <string>
@@ -84,7 +85,7 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
void backupNetworkSettings(); void backupNetworkSettings();
int showNetworkSetup(); int showNetworkSetup();
void showNetworkNTPSetup(CMenuWidget *menu_ntp); void showNetworkNTPSetup(CMenuWidget *menu_ntp);
void showNetworkNFSMounts(CMenuWidget *menu_nfs); void showNetworkNFSMounts(CMenuWidget *menu_nfs,CNETFSMountGui *netfsMountGui);
int saveChangesDialog(); int saveChangesDialog();
void applyNetworkSettings(); void applyNetworkSettings();
void saveNetworkSettings(); void saveNetworkSettings();