From 6ba4f32f0f4789d94880fa51d95ab5cec83492d3 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 15 Oct 2018 19:59:33 +0300
Subject: crash fix: don't crash if plugin was unloaded

---
 src/mir_core/src/langpack.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/mir_core')

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)
-- 
cgit v1.2.3