Skip to content
This repository has been archived by the owner. It is now read-only.

remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't … #681

Merged
merged 2 commits into from Aug 8, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
don't CoUninitialize for NO_MOVIES
  • Loading branch information
withmorten committed Aug 8, 2020
commit 24a1644b2a1f4cd0b20385fd29acd7be9808e027
@@ -2227,10 +2227,9 @@ WinMain(HINSTANCE instance,

case GS_INIT_INTRO_MPEG:
{
#ifndef NO_MOVIES
CloseClip();

#ifndef FIX_BUGS
CoUninitialize(); // CoUninitialize should only be called at the shutdown of a program, and by then it doesn't matter
CoUninitialize();
#endif

if ( CMenuManager::OS_Language == LANG_FRENCH || CMenuManager::OS_Language == LANG_GERMAN )
@@ -2265,9 +2264,9 @@ WinMain(HINSTANCE instance,

case GS_INIT_ONCE:
{
#ifndef NO_MOVIES
CloseClip();
#ifndef FIX_BUGS
CoUninitialize(); // CoUninitialize should only be called at the shutdown of a program, and by then it doesn't matter
CoUninitialize();
#endif

#ifdef FIX_BUGS