JumpList.cpp: Avoid crashes on App-V. refs #2548: Crash on opening 2 …

…files via drag & drop
WinMerge · Nov 21, 2024 · 8313dcb · 8313dcb
1 parent f1741e3
commit 8313dcb
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/Src/JumpList.cpp b/Src/JumpList.cpp
@@ -172,14 +172,21 @@ bool SetCurrentProcessExplicitAppUserModelID(const std::wstring& appid)
 
 bool AddToRecentDocs(const String& app_path, const String& params, const String& title, const String& desc, const String& icon_path, int icon_index)
 {
-	SHARDAPPIDINFOLINK saiil;
-	saiil.pszAppID = g_appid.c_str();
-	saiil.psl = CreateShellLink(app_path, params, title, desc, icon_path, icon_index);
-	if (saiil.psl == nullptr)
+	__try
+	{
+		SHARDAPPIDINFOLINK saiil;
+		saiil.pszAppID = g_appid.c_str();
+		saiil.psl = CreateShellLink(app_path, params, title, desc, icon_path, icon_index);
+		if (saiil.psl == nullptr)
+			return false;
+		SHAddToRecentDocs(SHARD_APPIDINFOLINK, &saiil);
+		saiil.psl->Release();
+		return true;
+	}
+	__except (EXCEPTION_EXECUTE_HANDLER)
+	{
 		return false;
-	SHAddToRecentDocs(SHARD_APPIDINFOLINK, &saiil);
-	saiil.psl->Release();
-	return true;
+	}
 }
 
 std::vector<Item> GetRecentDocs(size_t nMaxItems)