Merge branch 'master' into appveyor-test

TomGrobbe · TomGrobbe · commit 4c34e312d7e8 · 2020-05-13T18:56:52.000+02:00
diff --git a/MenuAPI/MenuController.cs b/MenuAPI/MenuController.cs
@@ -458,11 +458,11 @@ private async Task ProcessToggleMenuButton()
         {
 
 #if FIVEM
-            Game.DisableControlThisFrame(0, MenuToggleKey);
             if (!Game.IsPaused && !IsPauseMenuRestarting() && IsScreenFadedIn() && !IsPlayerSwitchInProgress() && !Game.Player.IsDead && !DisableMenuButtons)
             {
                 if (IsAnyMenuOpen())
                 {
+                    Game.DisableControlThisFrame(0, MenuToggleKey);
                     if (Game.CurrentInputMode == InputMode.MouseAndKeyboard)
                     {
                         if ((Game.IsControlJustPressed(0, MenuToggleKey) || Game.IsDisabledControlJustPressed(0, MenuToggleKey)) && !PreventExitingMenu)

Original file line number	Diff line number	Diff line change
`@@ -458,11 +458,11 @@ private async Task ProcessToggleMenuButton()`
`458`	`458`	`{`
`459`	`459`
`460`	`460`	`#if FIVEM`
`461`		`- Game.DisableControlThisFrame(0, MenuToggleKey);`
`462`	`461`	`if (!Game.IsPaused && !IsPauseMenuRestarting() && IsScreenFadedIn() && !IsPlayerSwitchInProgress() && !Game.Player.IsDead && !DisableMenuButtons)`
`463`	`462`	`{`
`464`	`463`	`if (IsAnyMenuOpen())`
`465`	`464`	`{`
	`465`	`+ Game.DisableControlThisFrame(0, MenuToggleKey);`
`466`	`466`	`if (Game.CurrentInputMode == InputMode.MouseAndKeyboard)`
`467`	`467`	`{`
`468`	`468`	`if ((Game.IsControlJustPressed(0, MenuToggleKey) \|\| Game.IsDisabledControlJustPressed(0, MenuToggleKey)) && !PreventExitingMenu)`