X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/654bb0a0f8583b7cbc47b32f7e9b6921dffc4e03..fb9f72903bf23e2b9a63e882398c12dbb6d495f0:/lib/python/Components/Task.py

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index d5fffbc6..a87f58d9 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -53,7 +53,7 @@ class Job(object):
 		self.status = self.IN_PROGRESS
 		self.state_changed()
 		self.runNext()
-		sumTaskWeightings = sum([t.weighting for t in self.tasks])
+		sumTaskWeightings = sum([t.weighting for t in self.tasks]) or 1
 		self.weightScale = self.end / float(sumTaskWeightings)
 
 	def runNext(self):
@@ -261,7 +261,11 @@ class JobManager:
 		if problems:
 			from Tools import Notifications
 			from Screens.MessageBox import MessageBox
-			Notifications.AddNotificationWithCallback(self.errorCB, MessageBox, _("Error: %s\nRetry?") % (problems[0].getErrorMessage(task)))
+			if problems[0].RECOVERABLE:
+				Notifications.AddNotificationWithCallback(self.errorCB, MessageBox, _("Error: %s\nRetry?") % (problems[0].getErrorMessage(task)))
+			else:
+				Notifications.AddNotification(MessageBox, _("Error") + (': %s') % (problems[0].getErrorMessage(task)), type = MessageBox.TYPE_ERROR )
+				self.errorCB(False)
 			return
 			#self.failed_jobs.append(self.active_job)
 
@@ -317,7 +321,7 @@ class Condition:
 	RECOVERABLE = False
 
 	def getErrorMessage(self, task):
-		return _("An error has occured. (%s)") % (self.__class__.__name__)
+		return _("An unknown error occured!") + " (%s @ task %s)" % (self.__class__.__name__, task.__class__.__name__)
 
 class WorkspaceExistsPrecondition(Condition):
 	def check(self, task):