Skip to content

Commit

Permalink
#797: don't log an error if the sequence is cancelled
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@14305 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 28, 2016
1 parent 4b4246d commit 2f80c2b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/xpra/server/window/window_video_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@ def encode_from_queue(self):
pop = None
index = 0
item = None
sequence = None
try:
for index,item in enumerate(eq):
#item = (w, h, damage_time, now, image, coding, sequence, options, flush)
Expand All @@ -826,8 +827,9 @@ def encode_from_queue(self):
#and just keep track of extra ones:
still_due.append(due)
except Exception:
avsynclog.error("error processing encode queue at index %i", index)
avsynclog.error("item=%s", item, exc_info=True)
if not self.is_cancelled(sequence):
avsynclog.error("error processing encode queue at index %i", index)
avsynclog.error("item=%s", item, exc_info=True)
if pop is not None:
eq.pop(pop)
return
Expand Down

0 comments on commit 2f80c2b

Please sign in to comment.