summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-10-15 19:59:33 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-10-15 19:59:33 +0300
commit6ba4f32f0f4789d94880fa51d95ab5cec83492d3 (patch)
tree893311d6d42c2647315a525f3202c71bff4306cd
parent918665d9c1c732902c4489ebbf2c67e9d97949cb (diff)
crash fix: don't crash if plugin was unloaded
-rw-r--r--src/mir_core/src/langpack.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mir_core/src/langpack.cpp b/src/mir_core/src/langpack.cpp
index 4c54fa338a..e0bb528f82 100644
--- a/src/mir_core/src/langpack.cpp
+++ b/src/mir_core/src/langpack.cpp
@@ -147,7 +147,13 @@ static const MUUID* GetMuid(HPLUGIN pPlugin)
if (!pPlugin)
return nullptr;
- return &pPlugin->getInfo().uuid;
+ __try {
+ return &pPlugin->getInfo().uuid;
+ }
+ __except (EXCEPTION_EXECUTE_HANDLER)
+ {
+ return nullptr;
+ }
}
static int SortLangPackHashesProc(LangPackEntry *arg1, LangPackEntry *arg2)