diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index eb9045d9ce..405f0a8006 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -4,8 +4,6 @@
using System;
using System.IO;
using System.Runtime.Versioning;
-using System.Threading;
-using System.Threading.Tasks;
using osu.Desktop.LegacyIpc;
using osu.Framework;
using osu.Framework.Development;
@@ -63,8 +61,6 @@ namespace osu.Desktop
using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { BindIPC = true }))
{
- host.ExceptionThrown += handleException;
-
if (!host.IsPrimaryInstance)
{
if (args.Length > 0 && args[0].Contains('.')) // easy way to check for a file import in args
@@ -131,23 +127,5 @@ namespace osu.Desktop
// tools.SetProcessAppUserModelId();
});
}
-
- private static int allowableExceptions = DebugUtils.IsDebugBuild ? 0 : 1;
-
- ///
- /// Allow a maximum of one unhandled exception, per second of execution.
- ///
- ///
- private static bool handleException(Exception arg)
- {
- bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
-
- Logger.Log($"Unhandled exception has been {(continueExecution ? $"allowed with {allowableExceptions} more allowable exceptions" : "denied")} .");
-
- // restore the stock of allowable exceptions after a short delay.
- Task.Delay(1000).ContinueWith(_ => Interlocked.Increment(ref allowableExceptions));
-
- return continueExecution;
- }
}
}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 324fcada89..c5b69a3637 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -7,6 +7,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
+using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Bindables;
@@ -180,9 +181,16 @@ namespace osu.Game
///
protected DatabaseContextFactory EFContextFactory { get; private set; }
+ ///
+ /// Number of exceptions to allow before aborting execution.
+ ///
+ protected virtual int SoftHandledExceptions => 0;
+
public OsuGameBase()
{
Name = @"osu!";
+
+ allowableExceptions = SoftHandledExceptions;
}
[BackgroundDependencyLoader]
@@ -408,6 +416,8 @@ namespace osu.Game
LocalConfig ??= UseDevelopmentServer
? new DevelopmentOsuConfigManager(Storage)
: new OsuConfigManager(Storage);
+
+ host.ExceptionThrown += onExceptionThrown;
}
///
@@ -505,6 +515,23 @@ namespace osu.Game
AvailableMods.Value = dict;
}
+ private int allowableExceptions;
+
+ ///
+ /// Allows a maximum of one unhandled exception, per second of execution.
+ ///
+ private bool onExceptionThrown(Exception _)
+ {
+ bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
+
+ Logger.Log($"Unhandled exception has been {(continueExecution ? $"allowed with {SoftHandledExceptions} more allowable exceptions" : "denied")} .");
+
+ // restore the stock of allowable exceptions after a short delay.
+ Task.Delay(1000).ContinueWith(_ => Interlocked.Increment(ref allowableExceptions));
+
+ return continueExecution;
+ }
+
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
@@ -514,6 +541,9 @@ namespace osu.Game
LocalConfig?.Dispose();
realm?.Dispose();
+
+ if (Host != null)
+ Host.ExceptionThrown -= onExceptionThrown;
}
}
}