BRANCH 4.1: fix possibility of SwapDisplayWdg losing track of whether it is open or not
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1