diff --git a/Laptop/BaseTable.cpp b/Laptop/BaseTable.cpp index 5ab2a3b59..e1c8ec37a 100644 --- a/Laptop/BaseTable.cpp +++ b/Laptop/BaseTable.cpp @@ -408,6 +408,9 @@ TabBox::Display( ) void TabBox::DestroyMouseRegions( ) { + if ( !IsInit( ) ) + return; + for ( std::vector::iterator it = mRegisteredTables.begin( ); it != mRegisteredTables.end( ); ++it ) { if ( (*it).mMouseRegion_Defined ) @@ -671,6 +674,9 @@ TestTable::Display( ) void TestTable::DestroyMouseRegions() { + if ( !IsInit( ) ) + return; + std::vector::iterator itend = mColumnDataProviderVector.end( ); for ( std::vector::iterator it = mColumnDataProviderVector.begin( ); it != itend; ++it ) { diff --git a/Laptop/BaseTable.h b/Laptop/BaseTable.h index ad7c91cbb..a0b357159 100644 --- a/Laptop/BaseTable.h +++ b/Laptop/BaseTable.h @@ -174,10 +174,14 @@ void cdp_statusbar_func_dummy( UINT32 aId, UINT16& arCol1, UINT16& arVal1, UINT1 class ColumnDataProvider { public: - ColumnDataProvider( STR16 aName ) : mName( aName ), mNumberOfEntries( 0 ), mRequiredHeigth(20), + ColumnDataProvider( STR16 aName ) : mName( aName ), mNumberOfEntries( 0 ), mRequiredLength(20), mRequiredHeigth( 20 ), mType( CDP_STRING ), mCallbackType( CDP_DEFAULT ), mFuncString( cdp_string_func_dummy ), mFuncImage( cdp_image_func_dummy ) { + for ( int i = 0; i < COLUMNDATAPROVIDER_MOUSEREGIONS; ++i ) + { + mMouseRegion_Defined[i] = FALSE; + } } // general provider functions