(In reply to comment #14)
> Created attachment 79305 [details] [review] [review]
> Possible Fix - Patch 2
> 
> Do these two patches fix the problem?

Fixed for me  - testing with nexuiz and etqw.