Fixed a bug where cancelling a colour dialog in the settings panel
would still let the icon with the last colour set in the dialog
Merge branch 'workshop' of https://github.com/MrKepzie/Natron into workshop