The code before was unsafe, had a race condition and could crash.
This Fixes Ticket499
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>