Skip to content

Commit 4987cd2

Browse files
Another progress dialog fix.
1 parent 3aba34a commit 4987cd2

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

resources/utils_kodi.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,18 @@ def __init__(self):
147147
self.dialog_active = False
148148
self.progressDialog = xbmcgui.DialogProgress()
149149

150-
def startProgress(self, message, num_steps = 100):
150+
def startProgress(self, message1, num_steps = 100, message2 = None):
151151
self.num_steps = num_steps
152152
self.progress = 0
153153
self.dialog_active = True
154-
self.message1 = message
155-
self.message2 = None
156-
self.progressDialog.create(self.title, self.message1)
154+
self.message1 = message1
155+
self.message2 = message2
156+
if self.message2:
157+
self.progressDialog.create(self.title, self.message1, self.message2)
158+
else:
159+
# The ' ' is to avoid a bug in Kodi progress dialog that keeps old messages 2
160+
# if an empty string is passed.
161+
self.progressDialog.create(self.title, self.message1, ' ')
157162
self.progressDialog.update(self.progress)
158163

159164
# Update progress and optionally update messages as well.
@@ -221,11 +226,11 @@ def endProgress(self):
221226
# when it was closed.
222227
def reopen(self):
223228
if self.message2:
224-
self.progressDialog.create(self.progress, self.message1, self.message2)
229+
self.progressDialog.create(self.title, self.message1, self.message2)
225230
else:
226231
# The ' ' is to avoid a bug in Kodi progress dialog that keeps old messages 2
227232
# if an empty string is passed.
228-
self.progressDialog.create(self.progress, self.message1, ' ')
233+
self.progressDialog.create(self.title, self.message1, ' ')
229234
self.progressDialog.update(self.progress)
230235
self.dialog_active = True
231236

0 commit comments

Comments
 (0)