这是indexloc提供的服务，不要输入任何密码
Skip to content

Release v2 R255 #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2020
Merged

Release v2 R255 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b37ff7
skip validity check for the Current Layout #168
dasgarner Sep 2, 2020
521961e
Merge pull request #169 from dasgarner/develop
dasgarner Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Log/ClientInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static readonly Lazy<ClientInfo>
/// <summary>
/// Current Layout Id
/// </summary>
public string CurrentLayoutId;
public int CurrentLayoutId;

/// <summary>
/// XMR Status
Expand Down
18 changes: 1 addition & 17 deletions Logic/ScheduleManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,6 @@ public bool RefreshSchedule
/// </summary>
public List<ScheduleItem> CurrentInterruptSchedule { get; private set; }

/// <summary>
/// Get or Set the current layout id
/// </summary>
public int CurrentLayoutId
{
get
{
return _currenctLayoutId;
}
set
{
lock (_locker)
_currenctLayoutId = value;
}
}

#endregion

/// <summary>
Expand Down Expand Up @@ -620,7 +604,7 @@ private List<ScheduleItem> LoadNewSchedule(bool isForInterrupt)
// If we haven't already assessed this layout before, then check that it is valid
if (!validLayoutIds.Contains(layout.id))
{
if (!ApplicationSettings.Default.ExpireModifiedLayouts && layout.id == CurrentLayoutId)
if (!ApplicationSettings.Default.ExpireModifiedLayouts && layout.id == ClientInfo.Instance.CurrentLayoutId)
{
Trace.WriteLine(new LogMessage("ScheduleManager - LoadNewSchedule", "Skipping validity test for current layout."), LogType.Audit.ToString());
}
Expand Down
2 changes: 1 addition & 1 deletion MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ private void StartLayout(Layout layout)
Debug.WriteLine("StartLayout: Started Layout", "MainWindow");

// Update client info
ClientInfo.Instance.CurrentLayoutId = layout.ScheduleItem.id + "";
ClientInfo.Instance.CurrentLayoutId = layout.ScheduleItem.id;
ClientInfo.Instance.CurrentlyPlaying = layout.ScheduleItem.layoutFile;
ClientInfo.Instance.ControlCount = this.Scene.Children.Count;

Expand Down