empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Andrea Odetti 2020-10-12 21:10:21 +01:00
commit 4866867d06
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/NTSC.cpp
View file

@ -2191,6 +2191,13 @@ _mono:
static void GenerateVideoTables( void ); static void GenerateVideoTables( void );
static void GenerateBaseColors(baseColors_t pBaseNtscColors); static void GenerateBaseColors(baseColors_t pBaseNtscColors);
void NTSC_Destroy(void)
{
// After a VM restart, this will point to an old g_pFramebufferbits
// - if it's now unmapped then this can cause a crash in NTSC_SetVideoMode()!
g_pVideoAddress = 0;
}
void NTSC_VideoInit( uint8_t* pFramebuffer ) // wsVideoInit void NTSC_VideoInit( uint8_t* pFramebuffer ) // wsVideoInit
{ {
make_csbits(); make_csbits();

1
source/NTSC.h
View file

@ -11,6 +11,7 @@
extern void NTSC_VideoClockResync( const DWORD dwCyclesThisFrame ); extern void NTSC_VideoClockResync( const DWORD dwCyclesThisFrame );
extern uint16_t NTSC_VideoGetScannerAddress( const ULONG uExecutedCycles ); extern uint16_t NTSC_VideoGetScannerAddress( const ULONG uExecutedCycles );
extern uint16_t NTSC_VideoGetScannerAddressForDebugger(void); extern uint16_t NTSC_VideoGetScannerAddressForDebugger(void);
extern void NTSC_Destroy(void);
extern void NTSC_VideoInit( uint8_t *pFramebuffer ); extern void NTSC_VideoInit( uint8_t *pFramebuffer );
extern void NTSC_VideoReinitialize( DWORD cyclesThisFrame, bool bInitVideoScannerAddress ); extern void NTSC_VideoReinitialize( DWORD cyclesThisFrame, bool bInitVideoScannerAddress );
extern void NTSC_VideoInitAppleType(); extern void NTSC_VideoInitAppleType();

2
source/Video.cpp
View file

@ -385,6 +385,8 @@ void VideoDestroy () {
DeleteObject(g_hLogoBitmap); DeleteObject(g_hLogoBitmap);
g_hLogoBitmap = (HBITMAP)0; g_hLogoBitmap = (HBITMAP)0;
} }
NTSC_Destroy();
} }
//=========================================================================== //===========================================================================