Fixes a infinite loop
Fixes half of Ticket800
Bug found by Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>