From f060bc1211530e6bb93a8d3519cfdb140ea6a759 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Wed, 27 Mar 2019 15:47:26 +1000 Subject: [PATCH] Merge consecutive Where calls --- BizHawk.Client.EmuHawk/Api/ApiManager.cs | 12 ++++++------ BizHawk.Client.EmuHawk/BizBox.cs | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/BizHawk.Client.EmuHawk/Api/ApiManager.cs index 9dd5b71087..52252ae114 100644 --- a/BizHawk.Client.EmuHawk/Api/ApiManager.cs +++ b/BizHawk.Client.EmuHawk/Api/ApiManager.cs @@ -20,18 +20,18 @@ namespace BizHawk.Client.EmuHawk var apis = Assembly .Load("BizHawk.Client.ApiHawk") .GetTypes() - .Where(t => typeof(IExternalApi).IsAssignableFrom(t)) - .Where(t => t.IsSealed) - .Where(t => ServiceInjector.IsAvailable(serviceProvider, t)) + .Where(t => typeof(IExternalApi).IsAssignableFrom(t) + && t.IsSealed + && ServiceInjector.IsAvailable(serviceProvider, t)) .ToList(); apis.AddRange( Assembly .GetAssembly(typeof(ApiContainer)) .GetTypes() - .Where(t => typeof(IExternalApi).IsAssignableFrom(t)) - .Where(t => t.IsSealed) - .Where(t => ServiceInjector.IsAvailable(serviceProvider, t))); + .Where(t => typeof(IExternalApi).IsAssignableFrom(t) + && t.IsSealed + && ServiceInjector.IsAvailable(serviceProvider, t))); foreach (var api in apis) { diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs index 5f9e509e82..d33b828ecc 100644 --- a/BizHawk.Client.EmuHawk/BizBox.cs +++ b/BizHawk.Client.EmuHawk/BizBox.cs @@ -44,8 +44,7 @@ namespace BizHawk.Client.EmuHawk foreach (var core in Assembly.Load("BizHawk.Emulation.Cores").GetTypes() .Where(t => typeof(IEmulator).IsAssignableFrom(t)) .Select(t => t.GetCustomAttributes(false).OfType().FirstOrDefault()) - .Where(a => a != null) - .Where(a => a.Released) + .Where(a => a != null && a.Released) .OrderByDescending(a => a.CoreName.ToLower())) { CoreInfoPanel.Controls.Add(new BizBoxInfoControl(core)