slight oversights

src/k_menufunc.c

@@ -976,20 +976,21 @@ void M_StartControlPanel(void)
 	}
 	else if (!Playing())
 	{
+		// we need to do this before setting ApplyProfile otherwise funky things are going to happen.
+		currentMenu = &MAIN_ProfilesDef;
+		optionsmenu.profilen = cv_lastprofile[0].value;
+
 		// options don't need initializing here.
 		PR_ApplyProfile(0, 0);	// apply guest profile to player 0 by default.
 		// this is to garantee that the controls aren't fucked up.
 
-		currentMenu = &MAIN_ProfilesDef;
-		optionsmenu.profilen = cv_lastprofile[0].value;
-
 		// make sure we don't overstep that.
 		if (optionsmenu.profilen > PR_GetNumProfiles())
 			optionsmenu.profilen = PR_GetNumProfiles();
 
 		itemOn = 0;
 
-		CV_StealthSetValue(&cv_currprofile, -1);	// Make sure to reset that.
+		CV_StealthSetValue(&cv_currprofile, -1);	// Make sure to reset that as it is set by PR_ApplyProfile which we kind of hack together to force it.
 	}
 	else
 	{

src/k_profiles.c

@@ -182,6 +182,10 @@ void PR_ApplyProfile(UINT8 profilenum, UINT8 playernum)
 
 	// set memory cvar
 	CV_StealthSetValue(&cv_lastprofile[playernum], profilenum);
+
+	// If we're doing this on P1, also change current profile.
+	if (!playernum)
+		CV_StealthSetValue(&cv_currprofile, profilenum);
 }
 
 UINT8 PR_GetProfileNum(profile_t *p)