From a6c03f8565ed115ffbc97264ee46c2fcc18d869d Mon Sep 17 00:00:00 2001
From: Jack Lukic <jacklukic@gmail.com>
Date: Fri, 26 Feb 2016 15:04:44 -0500
Subject: [PATCH] Fix issue with next timer not being removed on complete

---
 src/definitions/modules/progress.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js
index c9d2610fe..d7b98393b 100644
--- a/src/definitions/modules/progress.js
+++ b/src/definitions/modules/progress.js
@@ -93,8 +93,8 @@ $.fn.progress = function(parameters) {
         },
 
         complete: function() {
-          module.remove.progressPoll();
           if(module.percent === undefined || module.percent < 100) {
+            module.remove.progressPoll();
             module.set.percent(100);
           }
         },
@@ -327,7 +327,10 @@ $.fn.progress = function(parameters) {
         remove: {
           progressPoll: function() {
             module.verbose('Removing progress poll timer');
-            delete module.progressPoll;
+            if(module.progressPoll) {
+              clearTimeout(module.progressPoll);
+              delete module.progressPoll;
+            }
           },
           nextValue: function() {
             module.verbose('Removing progress value stored for next update');
@@ -459,6 +462,7 @@ $.fn.progress = function(parameters) {
               else {
                 module.verbose('Reached 100% removing active state');
                 module.remove.active();
+                module.remove.progressPoll();
               }
             }
             else if(percent > 0) {