mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix memleak in case of absent wlan, thanks to T.Graf for patch

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1319 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-03-21 08:20:50 +00:00
parent 907165fcb6
commit 1c81d89855
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/network_setup.cpp
View File

@@ -186,6 +186,7 @@ void CNetworkSetup::showNetworkSetup()
CMenuOptionStringChooser * ifSelect = new CMenuOptionStringChooser(LOCALE_NETWORKMENU_SELECT_IF, g_settings.ifname, ifcount > 1, this, CRCInput::RC_nokey, "", true); CMenuOptionStringChooser * ifSelect = new CMenuOptionStringChooser(LOCALE_NETWORKMENU_SELECT_IF, g_settings.ifname, ifcount > 1, this, CRCInput::RC_nokey, "", true);
bool found = false; bool found = false;
for(int i = 0; i < ifcount; i++) { for(int i = 0; i < ifcount; i++) {
ifSelect->addOption(namelist[i]->d_name); ifSelect->addOption(namelist[i]->d_name);
if(strcmp(g_settings.ifname, namelist[i]->d_name) == 0) if(strcmp(g_settings.ifname, namelist[i]->d_name) == 0)
@@ -227,8 +228,6 @@ void CNetworkSetup::showNetworkSetup()
//auto start //auto start
CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
CStringInputSMS * networkSettings_key = new CStringInputSMS(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.! ");
//dhcp //dhcp
network_dhcp = networkConfig->inet_static ? NETWORK_DHCP_OFF : NETWORK_DHCP_ON; network_dhcp = networkConfig->inet_static ? NETWORK_DHCP_OFF : NETWORK_DHCP_ON;
@@ -246,12 +245,6 @@ void CNetworkSetup::showNetworkSetup()
dhcpDisable[4] = m5; dhcpDisable[4] = m5;
dhcpEnable[0] = m8; dhcpEnable[0] = m8;
CMenuForwarder *m9 = new CMenuForwarder(LOCALE_NETWORKMENU_SSID , networkConfig->wireless, network_ssid , networkSettings_ssid );
CMenuForwarder *m10 = new CMenuForwarder(LOCALE_NETWORKMENU_PASSWORD , networkConfig->wireless, network_key , networkSettings_key );
wlanEnable[0] = m9;
wlanEnable[1] = m10;
CMenuOptionChooser* o2 = new CMenuOptionChooser(LOCALE_NETWORKMENU_DHCP, &network_dhcp, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); CMenuOptionChooser* o2 = new CMenuOptionChooser(LOCALE_NETWORKMENU_DHCP, &network_dhcp, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
//paint menu items //paint menu items
@@ -264,6 +257,9 @@ void CNetworkSetup::showNetworkSetup()
//------------------------------------------------ //------------------------------------------------
if(ifcount) if(ifcount)
networkSettings->addItem(ifSelect); //if select networkSettings->addItem(ifSelect); //if select
else
delete ifSelect;
networkSettings->addItem(o1); //set on start networkSettings->addItem(o1); //set on start
networkSettings->addItem(GenericMenuSeparatorLine); networkSettings->addItem(GenericMenuSeparatorLine);
//------------------------------------------------ //------------------------------------------------
@@ -283,7 +279,18 @@ void CNetworkSetup::showNetworkSetup()
networkSettings->addItem( m5); //nameserver networkSettings->addItem( m5); //nameserver
networkSettings->addItem(GenericMenuSeparatorLine); networkSettings->addItem(GenericMenuSeparatorLine);
//------------------------------------------------ //------------------------------------------------
if(ifcount > 1) { // if there is only one, its probably wired if(ifcount > 1) // if there is only one, its probably wired
{
//ssid
CStringInputSMS *networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-. ");
CMenuForwarder *m9 = new CMenuForwarder(LOCALE_NETWORKMENU_SSID , networkConfig->wireless, network_ssid , networkSettings_ssid );
//key
CStringInputSMS *networkSettings_key = new CStringInputSMS(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-. ");
CMenuForwarder *m10 = new CMenuForwarder(LOCALE_NETWORKMENU_PASSWORD , networkConfig->wireless, network_key , networkSettings_key );
wlanEnable[0] = m9;
wlanEnable[1] = m10;
networkSettings->addItem( m9); //ssid networkSettings->addItem( m9); //ssid
networkSettings->addItem( m10); //key networkSettings->addItem( m10); //key
networkSettings->addItem(GenericMenuSeparatorLine); networkSettings->addItem(GenericMenuSeparatorLine);