Merge pull request #436 from dorkster/bugfixes

Fix crash from holding down MAIN1 while loading a map