File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed
Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -560,6 +560,8 @@ private static int ProgressFormValue {
560560 ProgressManager . progressFormState = TBPF . TBPF_NOPROGRESS ;
561561 } else {
562562 // if we haven't completed, ignore the value in the marquee style
563+ // if state isn't normal, we update state later instead
564+ // because error/paused states take priority over marquee style
563565 if ( ProgressManager . style == ProgressBarStyle . Marquee
564566 && ProgressManager . state == PBST_NORMAL ) {
565567 // it's really important that there's no race condition here, so
@@ -635,7 +637,6 @@ private static IntPtr ProgressFormState {
635637 ProgressManager . progressFormState = TBPF . TBPF_PAUSED ;
636638 } else {
637639 // normal state does not take priority over marquee style
638- // (note: we don't check indeterminate state here, in case we are trying to leave that state)
639640 if ( ProgressManager . style == ProgressBarStyle . Marquee ) {
640641 return ;
641642 }
You can’t perform that action at this time.
0 commit comments