Merge pull request #3348 from JosJuice/u64

DolphinQt: Attempt at fixing issue 9170
This commit is contained in:
Mathew Maidment 2015-12-17 16:45:24 -05:00
commit c1b2eba82b
2 changed files with 7 additions and 2 deletions

View File

@ -109,8 +109,13 @@ GameFile::GameFile(const QString& fileName)
m_file_size = volume->GetRawSize(); m_file_size = volume->GetRawSize();
m_volume_size = volume->GetSize(); m_volume_size = volume->GetSize();
// A temporary variable is necessary here to convert between
// quint64 (needed by GameFile's cache code) and u64 (needed by GetTitleID)
u64 title_id;
volume->GetTitleID(&title_id);
m_title_id = title_id;
m_unique_id = QString::fromStdString(volume->GetUniqueID()); m_unique_id = QString::fromStdString(volume->GetUniqueID());
volume->GetTitleID(&m_title_id);
m_disc_number = volume->GetDiscNumber(); m_disc_number = volume->GetDiscNumber();
m_revision = volume->GetRevision(); m_revision = volume->GetRevision();

View File

@ -64,7 +64,7 @@ private:
QString m_company; QString m_company;
QString m_unique_id; QString m_unique_id;
u64 m_title_id; quint64 m_title_id;
QString m_issues; QString m_issues;
int m_emu_state = 0; int m_emu_state = 0;