Merge branch 'master' of https://github.com/anarchintosh/xbmc-urlreso…

…lver into anarchintosh-master

script.module.urlresolver/lib/urlresolver/countdown.py

@@ -1,5 +1,5 @@
 '''
-Countdown XBMC 0.3
+Countdown XBMC 0.4
 Copyleft Anarchintosh
 
 Set a countdown dialog with a progress bar for XBMC.
@@ -24,20 +24,19 @@ def countdown( time_to_wait, title='', text='' ):
     cancelled = False
     while secs <= time_to_wait:
 
-        percent = increment * secs
+        if (pDialog.iscanceled()):
+             cancelled = True
+             break
 
         secs_left = str((time_to_wait - secs))
 
         if secs != 0: xbmc.sleep(1000)
 
         if secs_left == '0': percent = 100
+        else: percent = increment * secs
 
         remaining_display = ' Wait '+secs_left+' seconds for the video stream to activate...'
-        pDialog.update(percent,' '+text,remaining_display)
-
-        if (pDialog.iscanceled()):
-             cancelled = True
-             break
+        pDialog.update( percent,' '+text, remaining_display )
 
         secs += 1