diff -r 15bf7259bb7c -r d8a3531bc6b8 uiacceltk/hitchcock/Client/src/alftexturegroup.cpp --- a/uiacceltk/hitchcock/Client/src/alftexturegroup.cpp Tue Feb 02 07:56:43 2010 +0200 +++ b/uiacceltk/hitchcock/Client/src/alftexturegroup.cpp Mon Feb 22 17:57:49 2010 +0200 @@ -109,23 +109,24 @@ // --------------------------------------------------------------------------- // EXPORT_C CAlfTextureGroup::~CAlfTextureGroup() - { - while (Count()) + { + if ( iData ) { - RemoveTexture(Texture(Count()-1)); - } + while (Count()) + { + RemoveTexture(Texture(Count()-1)); + } + + iData->iLoadObserverQueue.Close(); + iData->iTextures.Close(); + + delete iData->iTextureLoadObserver; + iData->iTextureLoadObserver = NULL; + } - if ( iData ) - { - iData->iLoadObserverQueue.Close(); - iData->iTextures.Close(); - - delete iData->iTextureLoadObserver; - iData->iTextureLoadObserver = NULL; - } + delete iData; + } - delete iData; - } // --------------------------------------------------------------------------- // NewL // ---------------------------------------------------------------------------