Check frameIndex to confirm video playback is active

bobtista · bobtista · commit 3b824a21234e · 2025-11-25T10:34:27.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -196,7 +196,9 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 
 Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const
 {
-	return m_videoStream != NULL && m_videoBuffer != NULL;
+	return m_videoStream != NULL 
+		&& m_videoBuffer != NULL 
+		&& m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;
 }
 
 void SinglePlayerLoadScreen::skipVideo( void )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -218,7 +218,9 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 
 Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const
 {
-	return m_videoStream != NULL && m_videoBuffer != NULL;
+	return m_videoStream != NULL 
+		&& m_videoBuffer != NULL 
+		&& m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;
 }
 
 void SinglePlayerLoadScreen::skipVideo( void )
@@ -759,7 +761,9 @@ ChallengeLoadScreen::~ChallengeLoadScreen( void )
 
 Bool ChallengeLoadScreen::isVideoPlaying( void ) const
 {
-	return m_videoStream != NULL && m_videoBuffer != NULL;
+	return m_videoStream != NULL 
+		&& m_videoBuffer != NULL 
+		&& m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;
 }
 
 void ChallengeLoadScreen::skipVideo( void )

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,9 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )`
`196`	`196`
`197`	`197`	`Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const`
`198`	`198`	`{`
`199`		`- return m_videoStream != NULL && m_videoBuffer != NULL;`
	`199`	`+ return m_videoStream != NULL`
	`200`	`+ && m_videoBuffer != NULL`
	`201`	`+ && m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;`
`200`	`202`	`}`
`201`	`203`
`202`	`204`	`void SinglePlayerLoadScreen::skipVideo( void )`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,9 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )`
`218`	`218`
`219`	`219`	`Bool SinglePlayerLoadScreen::isVideoPlaying( void ) const`
`220`	`220`	`{`
`221`		`- return m_videoStream != NULL && m_videoBuffer != NULL;`
	`221`	`+ return m_videoStream != NULL`
	`222`	`+ && m_videoBuffer != NULL`
	`223`	`+ && m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`void SinglePlayerLoadScreen::skipVideo( void )`
`@@ -759,7 +761,9 @@ ChallengeLoadScreen::~ChallengeLoadScreen( void )`
`759`	`761`
`760`	`762`	`Bool ChallengeLoadScreen::isVideoPlaying( void ) const`
`761`	`763`	`{`
`762`		`- return m_videoStream != NULL && m_videoBuffer != NULL;`
	`764`	`+ return m_videoStream != NULL`
	`765`	`+ && m_videoBuffer != NULL`
	`766`	`+ && m_videoStream->frameIndex() < m_videoStream->frameCount() - 1;`
`763`	`767`	`}`
`764`	`768`
`765`	`769`	`void ChallengeLoadScreen::skipVideo( void )`