Disable multi up=>options and disable multi double enter options

src/ScreenNetSelectMusic.cpp

@@ -407,76 +407,6 @@ ScreenNetSelectMusic::MenuRight(const InputEventPlus& input)
 	return true;
 }
 
-bool
-ScreenNetSelectMusic::MenuUp(const InputEventPlus& input)
-{
-	NSMAN->OnOptions();
-	GAMESTATE->m_EditMode = EditMode_Full;
-	SCREENMAN->AddNewScreenToTop(PLAYER_OPTIONS_SCREEN,
-								 SM_BackFromPlayerOptions);
-	return true;
-}
-
-/*
-bool
-ScreenNetSelectMusic::MenuDown(const InputEventPlus& input)
-{
-	// I agree, that's a stupid idea -aj
-
-	// Funny story:  If the arrow keys are mapped to Player 2, but the person
-	// is playing as Player 1, then hitting down to change the difficulty will
-	// crash in UpdateDifficulties.  So pretend the input came from the player
-	// that is enabled. -Kyz
-
-	PlayerNumber pn = input.pn;
-	if (!GAMESTATE->IsPlayerEnabled(pn)) {
-		if (pn == PLAYER_1) {
-			pn = PLAYER_2;
-		} else {
-			pn = PLAYER_1;
-		}
-	}
-
-	if (GAMESTATE->m_pCurSong == nullptr)
-		return false;
-	StepsType st = GAMESTATE->GetCurrentStyle(pn)->m_StepsType;
-	vector<Steps*> MultiSteps;
-	MultiSteps = GAMESTATE->m_pCurSong->GetStepsByStepsType(st);
-	if (MultiSteps.size() == 0)
-		m_DC[pn] = NUM_Difficulty;
-	else {
-		int i;
-
-		bool dcs[NUM_Difficulty];
-
-		for (i = 0; i < NUM_Difficulty; ++i)
-			dcs[i] = false;
-
-		for (i = 0; i < (int)MultiSteps.size(); ++i)
-			dcs[MultiSteps[i]->GetDifficulty()] = true;
-
-		for (i = 0; i < NUM_Difficulty; ++i) {
-			if ((dcs[i]) && (i > m_DC[pn])) {
-				m_DC[pn] = static_cast<Difficulty>(i);
-				break;
-			}
-		}
-		// If failed to go up, loop
-		if (i == NUM_Difficulty) {
-			for (i = 0; i < NUM_Difficulty; i++) {
-				if (dcs[i]) {
-					m_DC[pn] = static_cast<Difficulty>(i);
-					break;
-				}
-			}
-		}
-	}
-	UpdateDifficulties(pn);
-	GAMESTATE->m_PreferredDifficulty[pn].Set(m_DC[pn]);
-	return true;
-}
-*/
-
 bool
 ScreenNetSelectMusic::MenuStart(const InputEventPlus& input)
 {

src/ScreenNetSelectMusic.h

@@ -36,7 +36,6 @@ class ScreenNetSelectMusic : public ScreenSelectMusic
 	bool MenuBack(const InputEventPlus& input) override;
 	bool MenuLeft(const InputEventPlus& input) override;
 	bool MenuRight(const InputEventPlus& input) override;
-	bool MenuUp(const InputEventPlus& input) override;
 	bool LeftAndRightPressed(PlayerNumber pn);
 
 	void Update(float fDeltaTime) override;

src/ScreenSelectMusic.cpp

@@ -573,7 +573,7 @@ ScreenSelectMusic::Input(const InputEventPlus& input)
 	// Check for "Press START again for options" button press
 	if (m_SelectionState == SelectionState_Finalized &&
 		input.MenuI == GAME_BUTTON_START && input.type != IET_RELEASE &&
-		OPTIONS_MENU_AVAILABLE.GetValue()) {
+		OPTIONS_MENU_AVAILABLE.GetValue() && !GAMESTATE->m_bPlayingMulti) {
 		if (m_bGoToOptions)
 			return false; // got it already
 		if (!m_bAllowOptionsMenu)