midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4307 from valentinvanelslande/movie

Browse Source 
movie: fix some checks
This commit is contained in:
Pengfei Zhu 2018-10-05 17:37:52 -05:00 committed by GitHub
commit 0e42fa9fa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/movie.cpp
View File

@ -453,7 +453,7 @@ static boost::optional<CTMHeader> ReadHeader(const std::string& movie_file) {
void Movie::PrepareForPlayback(const std::string& movie_file) { void Movie::PrepareForPlayback(const std::string& movie_file) {
auto header = ReadHeader(movie_file); auto header = ReadHeader(movie_file);
if (header != boost::none) if (header == boost::none)
return; return;
init_time = header.value().clock_init_time; init_time = header.value().clock_init_time;
@ -468,7 +468,7 @@ void Movie::PrepareForRecording() {
Movie::ValidationResult Movie::ValidateMovie(const std::string& movie_file, u64 program_id) const { Movie::ValidationResult Movie::ValidateMovie(const std::string& movie_file, u64 program_id) const {
LOG_INFO(Movie, "Validating Movie file '{}'", movie_file); LOG_INFO(Movie, "Validating Movie file '{}'", movie_file);
auto header = ReadHeader(movie_file); auto header = ReadHeader(movie_file);
if (header != boost::none) if (header == boost::none)
return ValidationResult::Invalid; return ValidationResult::Invalid;
return ValidateHeader(header.value(), program_id); return ValidateHeader(header.value(), program_id);
@ -476,7 +476,7 @@ Movie::ValidationResult Movie::ValidateMovie(const std::string& movie_file, u64
u64 Movie::GetMovieProgramID(const std::string& movie_file) const { u64 Movie::GetMovieProgramID(const std::string& movie_file) const {
auto header = ReadHeader(movie_file); auto header = ReadHeader(movie_file);
if (header != boost::none) if (header == boost::none)
return 0; return 0;
return static_cast<u64>(header.value().program_id); return static_cast<u64>(header.value().program_id);