- quick fix to get core working again

master
Simon G 5 years ago
parent e5e0c574a7
commit 4b3387dd20
  1. 9
      Mystify/ViewModels/ChannelViewModel.cs
  2. 6
      Mystify/ViewModels/MainWindowViewModel.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);
}
}

@ -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;
}
}

Loading…
Cancel
Save