Skip to content

Commit 226ac9b

Browse files
committed
move up completed check in taskbar progress
1 parent f649558 commit 226ac9b

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

FlashpointSecurePlayer/ProgressManager.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,15 @@ private static ProgressBarStyle ProgressFormStyle {
487487
*/
488488

489489
set {
490+
// this happens first so we don't enter indeterminate state
491+
// if we're completed
492+
// otherwise when the value is reset and updates the style
493+
// it'll be ignored because we aren't in normal/no progress states
494+
// if we're in indeterminate state, it must be shown
495+
if (ProgressManager.progressFormValue >= PROGRESS_FORM_VALUE_COMPLETE) {
496+
return;
497+
}
498+
490499
// if the style is not marquee
491500
if (value != ProgressBarStyle.Marquee) {
492501
// do nothing if we have already left indeterminate state
@@ -499,15 +508,6 @@ private static ProgressBarStyle ProgressFormStyle {
499508
return;
500509
}
501510

502-
// this happens here so we don't enter indeterminate state
503-
// if we're completed
504-
// otherwise when the value is reset and updates the style
505-
// it'll be ignored because we aren't in normal/no progress states
506-
// if we're in indeterminate state, it must be shown
507-
if (ProgressManager.progressFormValue >= PROGRESS_FORM_VALUE_COMPLETE) {
508-
return;
509-
}
510-
511511
// only enter indeterminate state from normal/no progress states
512512
// we enter from no progress in case the value was reset
513513
// error/paused states take priority over indeterminate state
@@ -611,7 +611,7 @@ private static IntPtr ProgressFormState {
611611
*/
612612

613613
set {
614-
// this happens here so we don't enter error/paused state
614+
// this happens first so we don't enter error/paused state
615615
// if we're completed
616616
// otherwise when the value is reset and updates the state
617617
// it'll be ignored because we are in error/paused state

0 commit comments

Comments
 (0)