Merge pull request #958 from xaroth8088/master

Prevent crash when socket leaves a room twice.