Skip to content

Fix deadlock between auto-pause and action execution #122

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

Open
BhekananiCele wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deadlock between auto-pause and action execution #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions Move Mouse/ViewModels/MouseWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ private void StartAutoPauseTimer()
private void StopAutoPauseTimer()
{
StaticCode.Logger?.Here().Debug(String.Empty);

lock (_pauseLock)
{
try
Expand All @@ -814,14 +814,22 @@ private void _autoPauseTimer_Elapsed(object sender, System.Timers.ElapsedEventAr
try
{
StaticCode.Logger?.Here().Debug(StaticCode.GetLastInputTime().ToString());
bool shouldStop = false;
MouseState stopState = MouseState.Idle;

lock (_pauseLock)
{
if (CurrentState.Equals(MouseState.Running) && (StaticCode.GetLastInputTime() < TimeSpan.FromMilliseconds(_autoPauseTimer.Interval)))
{
Stop((SettingsVm.Settings.AutoPause && SettingsVm.Settings.AutoResume) ? MouseState.Paused : MouseState.Idle);
shouldStop = true;
stopState = (SettingsVm.Settings.AutoPause && SettingsVm.Settings.AutoResume) ? MouseState.Paused : MouseState.Idle;
}
}

if (shouldStop)
{
Stop(stopState);
}
}
catch (Exception ex)
{
Expand Down Expand Up @@ -1102,4 +1110,4 @@ public void Dispose()
}
}
}
}
}