diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index 34fddd94c..99168a9b0 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -669,8 +669,8 @@ void ImageAsset::populateImage(void) mImageHeight = tempFile->mHeight; } - ddsFs->close(); delete tempFile; + delete ddsFs; } else { diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp index e7bacb4f3..f064a7f09 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp @@ -1651,10 +1651,17 @@ void GuiPopUpMenuCtrlEx::addChildren() void GuiPopUpMenuCtrlEx::removeChildren() { - mTl->deleteObject(); - mSc->deleteObject(); - mSearchEdit->deleteObject(); - mBackground->deleteObject(); + if (mTl && !mTl->isDeleted()) + mTl->deleteObject(); + + if (mSc && !mSc->isDeleted()) + mSc->deleteObject(); + + if (mSearchEdit && !mSearchEdit->isDeleted()) + mSearchEdit->deleteObject(); + + if (mBackground && !mBackground->isDeleted()) + mBackground->deleteObject(); } //------------------------------------------------------------------------------