fix error window controller
Merge branch 'develop' of github.com:fishlamp/FishLamp into develop