Fix crash if controller is already connected on ROM load
Merge pull request #156 from maicki/master

Fix crash if controller is already connected on ROM load
Merge remote-tracking branch 'upstream/master'