Merge pull request #4724 from thedax/fixNetworkOption

Adhoc/Network: Default to off and save the value to the ini properly.

Core/Config.cpp

@@ -312,7 +312,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
 	}
 
 	IniFile::Section *network = iniFile.GetOrCreateSection("Network");
-	network->Get("EnableWlan", &bEnableWlan, true);
+	network->Get("EnableWlan", &bEnableWlan, false);
 	
 	IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam");
 #ifndef ANDROID
@@ -550,7 +550,7 @@ void Config::Save() {
 		control->Set("AnalogStickScale", fAnalogStickScale);
 
 		IniFile::Section *network = iniFile.GetOrCreateSection("Network");
-		network->Set("EnableWlan", &bEnableWlan, true);
+		network->Set("EnableWlan", bEnableWlan);
 
 		IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam");
 		pspConfig->Set("PSPModel", iPSPModel);

Core/HLE/sceNet.cpp

@@ -148,13 +148,13 @@ u32 sceNetGetLocalEtherAddr(u32 addrAddr) {
 }
 
 u32 sceWlanDevIsPowerOn() {
-	DEBUG_LOG(SCENET, "UNTESTED 0=sceWlanDevIsPowerOn()");
-	return 1;
+	DEBUG_LOG(SCENET, "UNTESTED sceWlanDevIsPowerOn()");
+	return g_Config.bEnableWlan ? 1 : 0;
 }
 
 u32 sceWlanGetSwitchState() {
 	DEBUG_LOG(SCENET, "UNTESTED sceWlanGetSwitchState()");
-	return 1;
+	return g_Config.bEnableWlan ? 1 : 0;
 }
 
 // Probably a void function, but often returns a useful value.