fix bug with taskbar progress: switching to marquee style when resetting

Author: tomysshadow

FlashpointSecurePlayer/ProgressManager.cs

@@ -467,28 +467,29 @@ public static Form ProgressForm {
         private static ProgressBarStyle ProgressFormStyle {
             /*
             get {
-                return ProgressManager.progressFormState == TaskbarProgressBarState.Indeterminate ? ProgressBarStyle.Marquee : ProgressBarStyle.Blocks;
+                return ProgressManager.progressFormState == TBPF.TBPF_INDETERMINATE ? ProgressBarStyle.Marquee : ProgressBarStyle.Blocks;
             }
             */
 
             set {
-                if (ProgressManager.progressFormValue >= PROGRESS_FORM_VALUE_COMPLETE) {
-                    return;
-                }
-
                 if (value != ProgressBarStyle.Marquee) {
                     ProgressFormValue = ProgressManager.value;
                     ProgressFormState = ProgressManager.state;
                     return;
                 }
 
                 // normal state does not take priority over indeterminate state
-                if (ProgressManager.progressFormState != TBPF.TBPF_NORMAL) {
+                if (ProgressManager.progressFormState != TBPF.TBPF_NORMAL
+                    && ProgressManager.progressFormState != TBPF.TBPF_NOPROGRESS) {
                     return;
                 }
 
                 ProgressManager.progressFormState = TBPF.TBPF_INDETERMINATE;
 
+                if (ProgressManager.progressFormValue >= PROGRESS_FORM_VALUE_COMPLETE) {
+                    return;
+                }
+
                 if (ProgressForm == null) {
                     return;
                 }
@@ -531,6 +532,7 @@ private static int ProgressFormValue {
                 } else {
                     // if we haven't completed, ignore the value in the indeterminate state
                     if (ProgressManager.progressFormState == TBPF.TBPF_INDETERMINATE) {
+                        ProgressFormStyle = ProgressManager.style;
                         return;
                     }
                 }
@@ -576,10 +578,6 @@ private static IntPtr ProgressFormState {
             */
 
             set {
-                if (ProgressManager.progressFormValue >= PROGRESS_FORM_VALUE_COMPLETE) {
-                    return;
-                }
-
                 if (value == PBST_ERROR) {
                     if (ProgressManager.progressFormState == TBPF.TBPF_ERROR) {
                         return;
@@ -604,6 +602,10 @@ private static IntPtr ProgressFormState {
 
                     ProgressManager.progressFormState = TBPF.TBPF_NORMAL;
                 }
+                
+                if (ProgressManager.progressFormValue >= PROGRESS_FORM_VALUE_COMPLETE) {
+                    return;
+                }
 
                 if (ProgressForm == null) {
                     return;