Skip to content

Commit

Permalink
version fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Deinonychus71 committed Dec 27, 2020
1 parent 64f2502 commit 48ed936
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Sm5shMusic.GUI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static void ConfigureServices()
.SetMinimumLevel(LogLevel.Debug)
.AddFile(configuration.GetSection("Logging"), c =>
{
c.FormatLogFileName = (o) => $"{Path.ChangeExtension(o, string.Empty)}{DateTime.Today.ToString("yyyyMMdd")}{Path.GetExtension(o)}";
c.FormatLogFileName = (o) => $"{Path.ChangeExtension(o, string.Empty)}{DateTime.Today:yyyyMMdd}{Path.GetExtension(o)}";
})
.AddProvider(new CustomConsoleLoggerProvider(LogLevel.Information)));

Expand Down
2 changes: 1 addition & 1 deletion Sm5shMusic.GUI/Services/GUIStateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ public string GameVersion
{
get
{
return _audioState.GameVersion == 0 ? "?? (custom)" : _audioState.GameVersion.ToString();
return _audioState.GameVersion == 0 ? "?? (custom)" : $"{_audioState.GameVersion}.0";
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public class BgmPropertiesModalWindowViewModel : ModalBaseViewModel<BgmEntryView
private readonly ReadOnlyObservableCollection<string> _streamSetIds;
private readonly Subject<Window> _whenNewRequestToAddGameEntry;
private bool _isUpdatingSpecialRule = false;
private const float _minimumVolume = -20.0;
private const float _maximumVolume = 20.0;
private const float _minimumVolume = -20.0f;
private const float _maximumVolume = 20.0f;

public IObservable<Window> WhenNewRequestToAddGameEntry { get { return _whenNewRequestToAddGameEntry; } }
public GamePropertiesModalWindowViewModel VMGamePropertiesModal { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ public override bool Equals(object obj)
if (obj == null)
return false;

SeriesEntryViewModel p = obj as SeriesEntryViewModel;
if (p == null)
if (!(obj is SeriesEntryViewModel p))
return false;

return p.SeriesId == this.SeriesId;
Expand Down
4 changes: 1 addition & 3 deletions Sm5shMusic.GUI/ViewModels/Views/PlaylistViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ namespace Sm5shMusic.GUI.ViewModels
public class PlaylistViewModel : ViewModelBase
{
private readonly IOptions<ApplicationSettings> _config;
private readonly ILogger _logging;
private readonly IMessageDialog _messageDialog;
private readonly ReadOnlyObservableCollection<BgmDbRootEntryViewModel> _bgms;
private readonly ReadOnlyObservableCollection<PlaylistEntryViewModel> _playlists;
Expand Down Expand Up @@ -78,11 +77,10 @@ public class PlaylistViewModel : ViewModelBase
public ReactiveCommand<Unit, Unit> ActionDeletePlaylist { get; }
public ReactiveCommand<Unit, Unit> ActionAssignPlaylistToStage { get; }

public PlaylistViewModel(IOptions<ApplicationSettings> config, ILogger<PlaylistViewModel> logging, IMessageDialog messageDialog, IObservable<IChangeSet<BgmDbRootEntryViewModel, string>> observableBgmEntries,
public PlaylistViewModel(IOptions<ApplicationSettings> config, IMessageDialog messageDialog, IObservable<IChangeSet<BgmDbRootEntryViewModel, string>> observableBgmEntries,
IObservable<IChangeSet<PlaylistEntryViewModel, string>> observablePlaylistEntries, ContextMenuViewModel vmContextMenu)
{
_config = config;
_logging = logging;
_messageDialog = messageDialog;
VMContextMenu = vmContextMenu;
_orderMenu = GetOrderList();
Expand Down

0 comments on commit 48ed936

Please sign in to comment.