Merge branch 'master' into fix-mods-masking

Author: minisbett

PerformanceCalculatorGUI/PerformanceCalculatorGame.cs

@@ -3,10 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Graphics.Cursor;
@@ -71,6 +73,13 @@ public override void SetHost(GameHost host)
             base.SetHost(host);
 
             host.Window.CursorState |= CursorState.Hidden;
+
+            var tabletInputHandler = host.AvailableInputHandlers.FirstOrDefault(x => x is OpenTabletDriverHandler && x.IsActive);
+
+            if (tabletInputHandler != null)
+            {
+                tabletInputHandler.Enabled.Value = false;
+            }
         }
 
         protected override void LoadComplete()

PerformanceCalculatorGUI/Program.cs

@@ -15,7 +15,8 @@ public static void Main(string[] args)
             using DesktopGameHost host = Host.GetSuitableDesktopHost("PerformanceCalculatorGUI", new HostOptions
             {
                 PortableInstallation = true,
-                BypassCompositor = false
+                BypassCompositor = false,
+                FriendlyGameName = "Performance Calculator GUI"
             });
 
             using var game = new PerformanceCalculatorGame();