Map cancel in DialogSelect to dialog.close

enen92 · Jul 22, 2015 · 36bd473 · 36bd473
1 parent 982bef7
commit 36bd473
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/resources/lib/automaticd.py b/resources/lib/automaticd.py
@@ -125,7 +125,14 @@ def automatic_downloader(mode):
 
 						if not already:
 							xbmc.sleep(3000)
+							before = const.Constr().return_array()
 							logowindow.start(match,"False","False",selected_channel=channel)
+							now = const.Constr().return_array()
+							if before == now:
+								if channel not in failed_log:
+									failed_log.append(channel)
+							del before
+							del now
 				else:
 					if channel not in failed_log:
 						failed_log.append(channel)

diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py
@@ -90,7 +90,7 @@ def dialogdown(self,name,numblocks, blocksize, filesize, dp, start_time):
 			total = float(filesize) / (1024 * 1024) 
 			mbs = '%.02f MB %s %.02f MB' % (currently_downloaded,'downloaded', total) 
 			e = ' (%.0f Kb/s) ' % kbps_speed 
-			tempo = 'Tempo:' + ' %02d:%02d' % divmod(eta, 60) 
+			tempo = 'Time left:' + ' %02d:%02d' % divmod(eta, 60) 
 			dp.update(percent,name +' - '+ mbs + e,tempo)
 		except: 
 			percent = 100 

diff --git a/resources/lib/logowindow.py b/resources/lib/logowindow.py
@@ -141,3 +141,7 @@ def onClick(self,controlId):
 								const.Constr().add_to_array(logo)
 				else:
 					mensagemok('TVLogo Downloader',"You haven't selected any channels")
+
+		elif controlId == 99:
+			self.close()
+		return