few fixes to wpf

j2ghz · Aug 15, 2018 · 674af3a · 674af3a
1 parent 4575379
commit 674af3a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 21 deletions.
diff --git a/src/ModSink.WPF/App.xaml.cs b/src/ModSink.WPF/App.xaml.cs
@@ -94,7 +94,6 @@ private void SetupLogging()
                     "{Timestamp:o} {Level:u3} [{SourceContext}-{ThreadId}] {Message} {Properties}{NewLine}{Exception}")
                 .Enrich.FromLogContext()
                 .Enrich.WithThreadId()
-                .Enrich.With<ExceptionEnricher>()
                 .MinimumLevel.Verbose()
                 .CreateLogger();
             Log.Information("Log initialized");

diff --git a/src/ModSink.WPF/Helpers/ExceptionEnricher.cs b/src/ModSink.WPF/Helpers/ExceptionEnricher.cs
diff --git a/src/ModSink.WPF/ViewModel/AppBootstrapper.cs b/src/ModSink.WPF/ViewModel/AppBootstrapper.cs
@@ -20,7 +20,7 @@ public AppBootstrapper()
             Locator.CurrentMutable.RegisterConstant(modsink);
             var cs = modsink.Client;
             DownloadsVM = new DownloadsViewModel(cs);
-            LibraryVM = new LibraryViewModel(cs);
+            LibraryVM = new LibraryViewModel(cs.Modpacks);
             SettingsVM = new SettingsViewModel(new SettingsModel(cs));
         }
 

diff --git a/src/ModSink.WPF/ViewModel/LibraryViewModel.cs b/src/ModSink.WPF/ViewModel/LibraryViewModel.cs
@@ -3,7 +3,6 @@
 using Anotar.Serilog;
 using DynamicData;
 using DynamicData.Binding;
-using ModSink.Common.Client;
 using ModSink.Common.Models.Repo;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -12,9 +11,9 @@ namespace ModSink.WPF.ViewModel
 {
     public class LibraryViewModel : ReactiveObject
     {
-        public LibraryViewModel(ClientService clientService)
+        public LibraryViewModel(IConnectableCache<Modpack, Guid> modpacks)
         {
-            clientService.Modpacks.Connect()
+            modpacks.Connect()
                 .ObserveOn(RxApp.MainThreadScheduler)
                 .Bind(Modpacks)
                 .Subscribe();