From 21f3d0ecf2d76222c39546e07e5b03e5c0330e26 Mon Sep 17 00:00:00 2001
From: sum2012 <consignpo@gmail.com>
Date: Sat, 23 Aug 2014 20:35:05 +0800
Subject: [PATCH] Add built-in AdhocServer option

---
 Core/Config.cpp           | 2 +-
 Core/Config.h             | 1 +
 Core/HLE/sceNetAdhoc.cpp  | 3 +--
 UI/GameSettingsScreen.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index c27ce470b7..5b31b6aebc 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -571,7 +571,7 @@ static ConfigSetting controlSettings[] = {
 
 static ConfigSetting networkSettings[] = {
 	ConfigSetting("EnableWlan", &g_Config.bEnableWlan, false, true, true),
-
+	ConfigSetting("EnableAdhocServer", &g_Config.bEnableAdhocServer, false, true, true),
 	ConfigSetting(false),
 };
 
diff --git a/Core/Config.h b/Core/Config.h
index b83a5d2522..7a3c825483 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -311,6 +311,7 @@ public:
 
 	// Networking
 	bool bEnableWlan;
+	bool bEnableAdhocServer;
 	int iWlanAdhocChannel;
 	bool bWlanPowerSave;
 
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index b3c8c50dd9..961d6b1535 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -204,8 +204,7 @@ u32 sceNetAdhocInit() {
 		}
 
 		// Create built-in AdhocServer Thread
-		// TODO: It might be better to have it's own config (ie. g_Config.bEnableAdhocServer)
-		if (g_Config.bEnableWlan) {
+		if (g_Config.bEnableAdhocServer) {
 			//_status = 1;
 			adhocServerRunning = true;
 			adhocServerThread = std::thread(proAdhocServerThread, SERVER_PORT);
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 673082d144..747327fb62 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -487,7 +487,7 @@ void GameSettingsScreen::CreateViews() {
 #else
 	systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, s->T("Change proAdhocServer Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
 #endif
-
+	systemSettings->Add(new CheckBox(&g_Config.bEnableAdhocServer, s->T("Enable built-in PRO Adhoc Server", "Enable built-in PRO Adhoc Server")));
 	systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, s->T("Change Mac Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress);
 
 //#ifndef ANDROID