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

FifoDataFile: Revert PadFile changes from 4.0-1127. #3131

Merged
merged 1 commit into from Oct 11, 2015

Conversation

delroth
Copy link
Member

@delroth delroth commented Oct 4, 2015

Fixes #9006.

Completely untested.


// Add space for frame list
u64 frameListOffset = file.Tell();
PadFile(m_Frames.size() * sizeof(FileFrameInfo), file);
file.Seek(m_Frames.size() * sizeof(FileFrameInfo), SEEK_END);

This comment was marked as off-topic.

This comment was marked as off-topic.

@delroth
Copy link
Member Author

delroth commented Oct 4, 2015

This fixes a regression from rc89f04a7 (4.0-1127) which should make this a candidate for 5.0. @Armada651

@delroth delroth changed the title FifoDataFile: Remove PadFile in favor of seeking after EOF. FifoDataFile: Revert PadFile changes from 4.0-1127. Oct 4, 2015
@delroth
Copy link
Member Author

delroth commented Oct 4, 2015

@JMC47 can you test DFF recording with this PR?

@degasus
Copy link
Member

degasus commented Oct 6, 2015

code LGTM

@Tilka
Copy link
Member

Tilka commented Oct 11, 2015

Oops.

Tilka added a commit that referenced this pull request Oct 11, 2015
FifoDataFile: Revert PadFile changes from 4.0-1127.
@Tilka Tilka merged commit e389a3c into dolphin-emu:master Oct 11, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants