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

Keep device type EXIDEVICE_MEMORYCARDFOLDER for gci folder. #559

Merged
merged 1 commit into from Jul 6, 2014

Conversation

RachelBryk
Copy link
Member

This fixes loading save states when type mismatches.

@@ -33,6 +33,8 @@ void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate)
// note that userdata is forbidden to be a pointer, due to the implementation of EventDoState
int card_index = (int)userdata;
CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index);
if (pThis == nullptr)
CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARDFOLDER, card_index);

This comment was marked as off-topic.

This fixes loading save states when type mismatches.
@lioncash
Copy link
Member

lioncash commented Jul 5, 2014

Looks good to me.

@delroth
Copy link
Member

delroth commented Jul 6, 2014

@dolphin-emu-bot allowmerge

dolphin-emu-bot added a commit that referenced this pull request Jul 6, 2014
Merge pull request #559 from RachelBryk/gci-folder-state

Keep device type EXIDEVICE_MEMORYCARDFOLDER for gci folder.
@dolphin-emu-bot dolphin-emu-bot merged commit 8da2bc6 into dolphin-emu:master Jul 6, 2014
@RachelBryk RachelBryk deleted the gci-folder-state branch July 6, 2014 06:16
@Nucleoprotein
Copy link

Can you also save relative memory card path to ini file instead off full file path ? Because I have some problem when using portable version of Dolphin now - it created new memory card in old place.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
5 participants