Comment 5 for bug 530542

Still in progress; my quick fix wasn't quite right. I'm discussing with upstream via mailing list about best way to properly implement the fix, which will probably be of the form "don't close window where you unmounted from".