summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/SmileyAdd/src/AniSmileyObject.cpp4
-rw-r--r--plugins/SmileyAdd/src/imagecache.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/SmileyAdd/src/AniSmileyObject.cpp b/plugins/SmileyAdd/src/AniSmileyObject.cpp
index 90a04df8fa..c437b9ab5a 100644
--- a/plugins/SmileyAdd/src/AniSmileyObject.cpp
+++ b/plugins/SmileyAdd/src/AniSmileyObject.cpp
@@ -71,8 +71,10 @@ public:
void UnloadSmiley()
{
- if (m_bRegistered)
+ if (m_bRegistered) {
m_sml->RemoveObject(this);
+ m_bRegistered = false;
+ }
if (m_img != NULL) {
m_img->Release();
diff --git a/plugins/SmileyAdd/src/imagecache.cpp b/plugins/SmileyAdd/src/imagecache.cpp
index fa6220934b..36fd89e09d 100644
--- a/plugins/SmileyAdd/src/imagecache.cpp
+++ b/plugins/SmileyAdd/src/imagecache.cpp
@@ -347,7 +347,6 @@ ImageType::ImageType(const unsigned id, const CMString& file, const int index, c
if (m_bmp->GetLastStatus() != Gdiplus::Ok) {
delete m_bmp;
m_bmp = NULL;
- return;
}
}