From f554531bd2824dffed8a3f9aa94be2ced0783e12 Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Thu, 1 Sep 2016 21:39:37 +0200
Subject: [PATCH] Fix not showing scroll cursor during standard-scrolling

... when edge scrolling was also disabled.
---
 OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
index 565a56767a..e2fa41c31b 100644
--- a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
@@ -210,7 +210,7 @@ namespace OpenRA.Mods.Common.Widgets
 
 		public override string GetCursor(int2 pos)
 		{
-			if (!IsJoystickScrolling &&
+			if (!(IsJoystickScrolling || isStandardScrolling) &&
 				(!Game.Settings.Game.ViewportEdgeScroll || Ui.MouseOverWidget != this))
 				return null;