summaryrefslogtreecommitdiff
path: root/TO_PORT
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-09 22:59:07 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-09 22:59:07 +0100
commit8d20417855c563afa08bda167ccf8ab8609208fa (patch)
tree24489cd8d7061a282964c52a8d63c6265c190f4d /TO_PORT
parent60b505349fcc21cfc8bbed0de75b21755d520038 (diff)
Apply a modified version of 7c76bbb0c989cb5e5e552f28668a985243438cab
from master; when we push an encoded frame's data to disk because we can't write it yet, the idea i to set encoded in the QueueItem to 0 to say that the data has already been pushed to disk. This was not working because we were resetting encoded in a copy of the QueueItem, and hence not affecting the QueueItem held in _queue. This meant that the same frame could be pushed to disk several times. Use the iterator instead of a copy so that the QueueItem in the list is modified.
Diffstat (limited to 'TO_PORT')
-rw-r--r--TO_PORT4
1 files changed, 1 insertions, 3 deletions
diff --git a/TO_PORT b/TO_PORT
index 1379650b3..9f7668d51 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,8 +1,6 @@
-1d63d0309d071254fcf4da65d3710e94fadd38e8
-0c0211871d0be5b3409adfc88d2979ca5b439b0a
-wscript/cscript etc. cleanups
2a3bfb06c68afd1aa4daaa14ece050689ea47927
f248f57f745176349a5ac938842216954aab477e
3eabb0b4eb8a2303ce4f7aa5ed2fd77645d803a8
07d0be5e167b326caefb8e9981d99faf3823b15b
0b3fb0ba4c841de950e6f62ddd3992925ca781c6
+wscript/cscript etc. cleanups