From fd0d5a38c780dc167496a459deb8ee31ca8b40b8 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 24 Jul 2021 21:09:17 +1000 Subject: [PATCH] Rewrite OSDManager.InputStrOrAll without local var --- .../DisplayManager/OSDManager.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs b/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs index 751e564a9e..234bd78ef4 100644 --- a/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs +++ b/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs @@ -205,16 +205,9 @@ namespace BizHawk.Client.Common } public string InputStrOrAll() - { - IController m = _inputManager.AutofireStickyXorAdapter; - - if (_movieSession.Movie.IsPlayingOrRecording() && _emulator.Frame > 0) - { - m = m.Or(_movieSession.Movie.GetInputState(_emulator.Frame - 1)); - } - - return MakeStringFor(m); - } + => MakeStringFor(_movieSession.Movie.IsPlayingOrRecording() && _emulator.Frame > 0 + ? _inputManager.AutofireStickyXorAdapter.Or(_movieSession.Movie.GetInputState(_emulator.Frame - 1)) + : _inputManager.AutofireStickyXorAdapter); private string MakeStringFor(IController controller) {