buffer/fromgplus: Some more loop prevention
Merge pull request #226 from annando/1412-loop-prevention

buffer/fromgplus: Some more loop prevention