DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development' into feature/gh-actions

Browse Source
This commit is contained in:
Robert committed 2023-03-06 22:03:07 +01:00
2 parents 4a8845e578 52d53f1d23
commit 5f206436c3
9 files changed
+44 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs
+5 -2
View File
@@ -48,8 +48,11 @@ public class LogsDebugViewModel : ActivatableViewModelBase
});
}
private void AddLogEvent(LogEvent logEvent)
private void AddLogEvent(LogEvent? logEvent)
{
if (logEvent is null)
return;
using StringWriter writer = new();
_formatter.Format(logEvent, writer);
string line = writer.ToString();
@@ -60,7 +63,7 @@ public class LogsDebugViewModel : ActivatableViewModelBase
private void RemoveOldestLine()
{
int firstNewLine = Document.Text.IndexOf('\n');
int firstNewLine = Document.IndexOf('\n', 0, Document.TextLength);
if (firstNewLine == -1)
{
//this should never happen.
src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs
+1 -1
View File
@@ -53,7 +53,7 @@ public class StartupWizardViewModel : DialogViewModelBase<bool>
DeviceProviders = new ObservableCollection<PluginViewModel>(pluginManagementService.GetAllPlugins()
.Where(p => p.Info.IsCompatible && p.Features.Any(f => f.AlwaysEnabled && f.FeatureType.IsAssignableTo(typeof(DeviceProvider))))
.OrderBy(p => p.Info.Name)
.Select(p => settingsVmFactory.PluginViewModel(p, null)));
.Select(p => settingsVmFactory.PluginViewModel(p, ReactiveCommand.Create(() => new Unit()))));
CurrentStep = 1;
SetupButtons();