Merge remote-tracking branch 'origin/main' into networking

Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp

@@ -54,9 +54,7 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo
 	else if( newState == SQRNetworkManager::SNM_STATE_JOINING )
 	{
 		// 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon
-#ifdef __ORBIS__
-		sceNpCommerceHidePsStoreIcon();
-#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
+#if defined __PSVITA__ || defined __ORBIS__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		m_bLeavingGame = false;

Minecraft.Client/Common/Network/Sony/SonyCommerce.h

@@ -170,8 +170,7 @@ public:
 	virtual void CheckForTrialUpgradeKey() = 0;
 	virtual bool LicenseChecked() = 0;
 
-// str1k3r: Currently does not work on Orbis.
-#if defined __PSVITA__ // || defined __ORBIS__
+#if defined __PSVITA__ || defined __ORBIS__
 	virtual void ShowPsStoreIcon() = 0;
 	virtual void HidePsStoreIcon() = 0;
 #endif