Does this fix that nasty race condition...

..that messes up the whole demuxer..
or does it cause a deadlock?