Browse Source

Fix merge

pull/165/head
Ionite 1 year ago
parent
commit
c3fbba5d48
No known key found for this signature in database
  1. 1
      StabilityMatrix.Avalonia/ViewModels/Dialogs/ImageViewerViewModel.cs
  2. 1
      StabilityMatrix.Avalonia/ViewModels/Dialogs/InferenceConnectionHelpViewModel.cs
  3. 5
      StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
  4. 3
      StabilityMatrix.Core/Services/TrackedDownloadService.cs

1
StabilityMatrix.Avalonia/ViewModels/Dialogs/ImageViewerViewModel.cs

@ -1,5 +1,6 @@
using CommunityToolkit.Mvvm.ComponentModel;
using StabilityMatrix.Avalonia.Models;
using StabilityMatrix.Avalonia.ViewModels.Base;
using StabilityMatrix.Avalonia.Views.Dialogs;
using StabilityMatrix.Core.Attributes;

1
StabilityMatrix.Avalonia/ViewModels/Dialogs/InferenceConnectionHelpViewModel.cs

@ -10,6 +10,7 @@ using StabilityMatrix.Avalonia.Animations;
using StabilityMatrix.Avalonia.Controls;
using StabilityMatrix.Avalonia.Languages;
using StabilityMatrix.Avalonia.Services;
using StabilityMatrix.Avalonia.ViewModels.Base;
using StabilityMatrix.Avalonia.Views;
using StabilityMatrix.Avalonia.Views.Dialogs;
using StabilityMatrix.Core.Attributes;

5
StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs

@ -167,11 +167,6 @@ public partial class SettingsViewModel : PageViewModelBase
settingsManager.RelayPropertyFor(
this,
vm => vm.IsDiscordRichPresenceEnabled,
settings => settings.IsDiscordRichPresenceEnabled
);
settingsManager.RelayPropertyFor(
this,
settings => settings.IsDiscordRichPresenceEnabled,
true
);

3
StabilityMatrix.Core/Services/TrackedDownloadService.cs

@ -2,7 +2,6 @@
using System.Text;
using System.Text.Json;
using Microsoft.Extensions.Logging;
using StabilityMatrix.Core.Database;
using StabilityMatrix.Core.Models;
using StabilityMatrix.Core.Models.FileInterfaces;
using StabilityMatrix.Core.Models.Progress;
@ -18,7 +17,7 @@ public class TrackedDownloadService : ITrackedDownloadService, IDisposable
private readonly ConcurrentDictionary<
Guid,
(TrackedDownloadDownload, FileStream Stream)
(TrackedDownload Download, FileStream Stream)
> downloads = new();
public IEnumerable<TrackedDownload> Downloads => downloads.Values.Select(x => x.Download);

Loading…
Cancel
Save