From 4b3387dd20c2bdba4dd1a970aaa64f61dd75fb0f Mon Sep 17 00:00:00 2001
From: Simon G <simon.gockner@gmail.com>
Date: Wed, 14 Apr 2021 19:33:56 +0200
Subject: [PATCH] - quick fix to get core working again

---
 Mystify/ViewModels/ChannelViewModel.cs    | 9 +++++----
 Mystify/ViewModels/MainWindowViewModel.cs | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Mystify/ViewModels/ChannelViewModel.cs b/Mystify/ViewModels/ChannelViewModel.cs
index 062a919..2dce010 100644
--- a/Mystify/ViewModels/ChannelViewModel.cs
+++ b/Mystify/ViewModels/ChannelViewModel.cs
@@ -12,24 +12,25 @@ namespace Mystify.ViewModels
 {
     public class ChannelViewModel : ViewModelBase
     {
-        private readonly IChannel _channel;
         private readonly MainWindow? _mainWindow;
         private readonly MainModel _mainModel;
 
         public ChannelViewModel(IChannel channel, MainWindow? mainWindow, MainModel mainModel)
         {
-            _channel = channel;
+            Channel = channel;
             _mainWindow = mainWindow;
             _mainModel = mainModel;
         }
 
+        public IChannel Channel { get; }
+        
         public ControllableViewModel? Controllable
         {
-            get => _channel.Controllable == null ? null : new ControllableViewModel(_channel.Controllable);
+            get => Channel.Controllable == null ? null : new ControllableViewModel(Channel.Controllable);
             set
             {
                 if (value != null)
-                    _channel.MapControllable(value.Controllable);
+                    Channel.MapControllable(value.Controllable);
             }
         }
 
diff --git a/Mystify/ViewModels/MainWindowViewModel.cs b/Mystify/ViewModels/MainWindowViewModel.cs
index 99eab46..f97ca43 100644
--- a/Mystify/ViewModels/MainWindowViewModel.cs
+++ b/Mystify/ViewModels/MainWindowViewModel.cs
@@ -35,13 +35,13 @@ namespace Mystify.ViewModels
         public ObservableCollection<ChannelViewModel>? Channels => _mainModel?.Channels?.Select(c => new ChannelViewModel(c, _mainWindow, _mainModel)).ToObservableCollection();
         public List<IControllable>? Controllables => _mainModel?.Controllables;
 
-        public IChannel? SelectedChannel
+        public ChannelViewModel? SelectedChannel
         {
-            get => _mainModel?.SelectedChannel;
+            get => _mainModel?.SelectedChannel == null ? null : new ChannelViewModel(_mainModel.SelectedChannel, _mainWindow, _mainModel);
             set
             {
                 if (_mainModel != null) 
-                    _mainModel.SelectedChannel = value;
+                    _mainModel.SelectedChannel = value?.Channel;
             }
         }