From a703f7cf00da7c5bb969c8f3058cae6c9ac48c24 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 16 Mar 2011 19:39:35 +0000 Subject: [PATCH] use system(cmd) in DEBUG mode git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1306 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8f064b2bbd86edc17bac64af01319c4fb2fba596 Author: Jacek Jendrzej Date: 2011-03-16 (Wed, 16 Mar 2011) ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 4 ++-- src/system/configure_network.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 06048702a..2d0d8ac31 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -604,8 +604,8 @@ void CNetworkSetup::showCurrentNetworkSettings() else { netGetNameserver(nameserver); netGetDefaultRoute(router); - CNetworkConfig networkConfig; - std::string dhcp = networkConfig.inet_static ? g_Locale->getText(LOCALE_OPTIONS_OFF) : g_Locale->getText(LOCALE_OPTIONS_ON); + CNetworkConfig _networkConfig; + std::string dhcp = _networkConfig.inet_static ? g_Locale->getText(LOCALE_OPTIONS_OFF) : g_Locale->getText(LOCALE_OPTIONS_ON); text = (std::string)g_Locale->getText(LOCALE_NETWORKMENU_DHCP) + ": " + dhcp + '\n' + g_Locale->getText(LOCALE_NETWORKMENU_IPADDRESS ) + ": " + ip + '\n' diff --git a/src/system/configure_network.cpp b/src/system/configure_network.cpp index 3bc1526c1..6c17fb156 100644 --- a/src/system/configure_network.cpp +++ b/src/system/configure_network.cpp @@ -220,9 +220,9 @@ void CNetworkConfig::startNetwork(void) std::string cmd = "/sbin/ifup " + ifname; #ifdef DEBUG printf("CNetworkConfig::startNetwork: %s\n", cmd.c_str()); -#else - system(cmd.c_str()); #endif + system(cmd.c_str()); + if (!inet_static) { init_vars(); } @@ -234,9 +234,9 @@ void CNetworkConfig::stopNetwork(void) std::string cmd = "/sbin/ifdown " + ifname; #ifdef DEBUG printf("CNetworkConfig::stopNetwork: %s\n", cmd.c_str()); -#else - system(cmd.c_str()); #endif + system(cmd.c_str()); + } void CNetworkConfig::readWpaConfig()