From 0256a0d6259a2c92b5ad1ab06a409169e6ae8835 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 4 Jul 2022 17:58:44 +0200 Subject: [PATCH] Settings - Fix general tab breaking when there is no graphics context --- src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs index 998c825d3..2d750ee1b 100644 --- a/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs @@ -15,6 +15,7 @@ using Artemis.UI.Shared; using Avalonia; using DynamicData; using FluentAvalonia.Styling; +using Ninject; using ReactiveUI; using Serilog.Events; @@ -27,7 +28,7 @@ namespace Artemis.UI.Screens.Settings private readonly IDebugService _debugService; private readonly FluentAvaloniaTheme _fluentAvaloniaTheme; - public GeneralTabViewModel(ISettingsService settingsService, IPluginManagementService pluginManagementService, IDebugService debugService, IGraphicsContextProvider? graphicsContextProvider) + public GeneralTabViewModel(IKernel kernel, ISettingsService settingsService, IPluginManagementService pluginManagementService, IDebugService debugService) { DisplayName = "General"; _settingsService = settingsService; @@ -37,6 +38,7 @@ namespace Artemis.UI.Screens.Settings List layerBrushProviders = pluginManagementService.GetFeaturesOfType(); LayerBrushDescriptors = new ObservableCollection(layerBrushProviders.SelectMany(l => l.LayerBrushDescriptors)); GraphicsContexts = new ObservableCollection {"Software"}; + IGraphicsContextProvider? graphicsContextProvider = kernel.TryGet(); if (graphicsContextProvider != null) GraphicsContexts.AddRange(graphicsContextProvider.GraphicsContextNames);