rebase for the 4th time

Minecraft.Client/Common/UI/UIScene_MainMenu.cpp

@@ -750,7 +750,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
 			if(ProfileManager.IsFullVersion())
 			{
 				bool bSignedInLive = ProfileManager.IsSignedInLive(iPad);
-#ifdef __PSVITA__
+#if !defined DISABLE_PSN && defined __PSVITA__
 				if(CGameNetworkManager::usingAdhocMode())
 				{
 					if(SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())
@@ -1343,7 +1343,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad)
 		{
 			// are we offline?
 			bool bSignedInLive = ProfileManager.IsSignedInLive(iPad);
-#ifdef __PSVITA__
+#if !defined DISABLE_PSN && defined __PSVITA__
 			if(app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_PSVita_NetworkModeAdhoc) == true)
 			{
 				CGameNetworkManager::setAdhocMode(true);