From 127be2472d1c7467d49c0082fcff16354e70636c Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Fri, 28 Oct 2016 21:24:03 -0400
Subject: [PATCH] Add delay before group update

---
 SQF/dayz_code/groups/joinGroup.sqf              | 10 ++++++----
 SQF/dayz_code/groups/promotePlayer.sqf          |  6 +++---
 SQF/dayz_server/compile/server_toggle_debug.hpp |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/SQF/dayz_code/groups/joinGroup.sqf b/SQF/dayz_code/groups/joinGroup.sqf
index 6017eae6c..73caa1468 100644
--- a/SQF/dayz_code/groups/joinGroup.sqf
+++ b/SQF/dayz_code/groups/joinGroup.sqf
@@ -22,10 +22,12 @@ if (!isNull _inviter) then {
 	_oldGroup = group player;
 	[player] join (group _inviter);
 	if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;};
-	
-	// Update saved group in DB
-	PVDZ_Server_UpdateGroup = [1,player];
-	publicVariableServer "PVDZ_Server_UpdateGroup";
+	[] spawn {
+		uiSleep 1; //Required for group change to update on server
+		// Update saved group in DB
+		PVDZ_Server_UpdateGroup = [1,player];
+		publicVariableServer "PVDZ_Server_UpdateGroup";
+	};
 } else {
 	_this ctrlShow false;
 	systemChat localize "STR_EPOCH_INVITE_EXPIRED";
diff --git a/SQF/dayz_code/groups/promotePlayer.sqf b/SQF/dayz_code/groups/promotePlayer.sqf
index 5f2a64f17..cb0c0d327 100644
--- a/SQF/dayz_code/groups/promotePlayer.sqf
+++ b/SQF/dayz_code/groups/promotePlayer.sqf
@@ -1,8 +1,9 @@
-private ["_disbandButton","_display","_group","_myGroup","_target","_uid"];
+private ["_disbandButton","_display","_group","_kickButton","_myGroup","_target","_uid"];
 
 disableSerialization;
 _display = findDisplay 80000;
 _myGroup = _display displayCtrl 2;
+_kickButton = _display displayCtrl 4;
 _disbandButton = _display displayCtrl 5;
 _promoteButton = _this;
 _uid = _myGroup lbData (lbCurSel _myGroup);
@@ -12,8 +13,7 @@ _target = _uid call dayz_getPlayer;
 
 if (player == leader _group && {!isNull _target} && {_target != player}) then {
 	_group selectLeader _target;
-	_promoteButton ctrlShow false;
-	_disbandButton ctrlShow false;
+	{_x ctrlShow false} count [_disbandButton,_kickButton,_promoteButton];
 } else {
 	_promoteButton ctrlShow false;
 };
\ No newline at end of file
diff --git a/SQF/dayz_server/compile/server_toggle_debug.hpp b/SQF/dayz_server/compile/server_toggle_debug.hpp
index 46f1fbffd..a52aa7f49 100644
--- a/SQF/dayz_server/compile/server_toggle_debug.hpp
+++ b/SQF/dayz_server/compile/server_toggle_debug.hpp
@@ -15,5 +15,5 @@ Please request permission to use/alter/distribute from project leader (R4Z0R49)
 #define PLAYER_DEBUG
 
 // comment this out if you don't want any misc SERVER (ZOMBIE, LOOT, CLEANUP) related debug
-#define SERVER_DEBUG
+//#define SERVER_DEBUG