Avoid clearing canvas twice
Merge pull request #1314 from fredj/canvas_clear

Avoid clearing canvas twice