Fix reload / refresh logic when not debugging (#650)

9 files changed