From c433d34798dacf10ebcc175f6d58974141d7aff0 Mon Sep 17 00:00:00 2001
From: player701 <player701@player701.ru>
Date: Sun, 30 Dec 2018 11:17:56 +0300
Subject: [PATCH] - Fixed settings_controller not updating properly when a
 player becomes the new arbitrator in a netgame.

---
 src/p_user.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/p_user.cpp b/src/p_user.cpp
index 6077d597c0..92369ceb83 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -1922,9 +1922,11 @@ void P_UnPredictPlayer ()
 
 		TObjPtr<AActor*> InvSel = act->InvSel;
 		int inventorytics = player->inventorytics;
+		const bool settings_controller = player->settings_controller;
 
 		*player = PredictionPlayerBackup;
 
+		player->settings_controller = settings_controller;
 		// Restore the camera instead of using the backup's copy, because spynext/prev
 		// could cause it to change during prediction.
 		player->camera = savedcamera;