Merge branch 'master' into fix-chat-msg-twice

Author: Fernando-A-Rocha

[gameplay]/freeroam/fr_client.lua

@@ -2123,7 +2123,9 @@ function onExitVehicle(vehicle,seat)
 		hideControls(wndMain, 'repair', 'flip', 'upgrades', 'color', 'paintjob', 'lightson', 'lightsoff')
 		closeWindow(wndUpgrades)
 		closeWindow(wndColor)
-	elseif vehicle and seat == 0 then
+	end
+		
+	if vehicle and seat == 0 then
 		if source and g_PlayerData[source] then
 			setVehicleGhost(vehicle,hasDriverGhost(vehicle))
 		end
@@ -2243,11 +2245,21 @@ addEventHandler('onClientResourceStart', resourceRoot,
 		createWindow(wndMain)
 		hideAllWindows()
 		bindKey('f1', 'down', toggleFRWindow)
+		bindKey('f2', 'down', toggleMap)
 		guiCheckBoxSetSelected(getControl(wndMain, 'jetpack'), isPedWearingJetpack(localPlayer))
 		guiCheckBoxSetSelected(getControl(wndMain, 'falloff'), canPedBeKnockedOffBike(localPlayer))
 	end
 )
 
+addEventHandler('onClientResourceStart', root,
+	function(startedResource)
+		local editorResource, raceResource = getResourceFromName('editor'), getResourceFromName('race')
+		if (editorResource and raceResource and startedResource == raceResource) then
+			unbindKey('f2', 'down', toggleMap)
+		end
+	end
+)
+
 function showWelcomeMap()
 	createWindow(wndSpawnMap)
 	showCursor(true)
@@ -2267,7 +2279,6 @@ function toggleMap()
 		showCursor(true)
 	end
 end
-bindKey("f2", "down", toggleMap)
 
 function toggleFRWindow()
 	if isWindowOpen(wndMain) then
@@ -2355,6 +2366,15 @@ addEventHandler('onClientResourceStop', resourceRoot,
 	end
 )
 
+addEventHandler('onClientResourceStop', root,
+	function(stoppingResource)
+		local editorResource, raceResource = getResourceFromName('editor'), getResourceFromName('race')
+		if (editorResource and raceResource and stoppingResource == raceResource) then
+			bindKey('f2', 'down', toggleMap)
+		end
+	end
+)
+
 function setVehicleGhost(sourceVehicle,value)
 
 	  local vehicles = getElementsByType("vehicle")