Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crashes when dragging and dropping files outside of the gamelist #522

Merged
merged 1 commit into from Jun 28, 2014

Conversation

lioncash
Copy link
Member

Prior to this PR dragging and dropping games into a docked window other than the game list would cause the emulator to initialize incorrectly and crash due to an access violation from dereferencing a null pointer (thanks to JMC for pointing this out). Since the idea here is to initialize the game/compatible file regardless of its dropped location within the main frame, it makes sense to actually have this handling code within the Frame code.

The game list is locked into the main frame, so this still retains the same behavior. It just won't crash when drag/drop is done on any other docked window in the main frame.

@@ -53,6 +54,7 @@
#include "Core/CoreParameter.h"
#include "Core/Movie.h"
#include "Core/State.h"
#include "Core/HW/DVDInterface.h"

This comment was marked as off-topic.

This comment was marked as off-topic.

@neobrain
Copy link
Member

Mostly LGTM.

lioncash added a commit that referenced this pull request Jun 28, 2014
Fix crashes when dragging and dropping files outside of the gamelist
@lioncash lioncash merged commit 91da031 into dolphin-emu:master Jun 28, 2014
@lioncash lioncash deleted the fix-dragdrop-crash branch June 28, 2014 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants