This has been tested by KeldorKatarn.
If there are no other testers testing this, I recommended committing the patch:
1) It adds the line of protection that the normal HUD gauges use
2) 90% of the patch is corrections to indentation to be consistent within the changed block
1933 can be closed 'fixed' if this is committed.