Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit c8c8a46374b5 · 2025-07-31T10:16:49.000Z
3cdf20d Show the out of memory message for any module
diff --git a/Client/loader/CInstallManager.cpp b/Client/loader/CInstallManager.cpp
@@ -432,10 +432,10 @@ SString CInstallManager::_ShowCrashFailDialog()
         strMessage += strReason;
     }
 
-    const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");
-    const int     exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");
+    // const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");
+    const int exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");
 
-    if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM && moduleName.EndsWithI("\\kernelbase.dll"))
+    if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM)
     {
         strMessage += '\n';
         strMessage += _("** Out of memory - this crash was caused by insufficient free or fragmented memory. **");

Original file line number	Diff line number	Diff line change
`@@ -432,10 +432,10 @@ SString CInstallManager::_ShowCrashFailDialog()`
`432`	`432`	`strMessage += strReason;`
`433`	`433`	`}`
`434`	`434`
`435`		`- const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");`
`436`		`- const int exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");`
	`435`	`+ // const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");`
	`436`	`+ const int exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");`
`437`	`437`
`438`		`- if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM && moduleName.EndsWithI("\\kernelbase.dll"))`
	`438`	`+ if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM)`
`439`	`439`	`{`
`440`	`440`	`strMessage += '\n';`
`441`	`441`	`strMessage += _(" Out of memory - this crash was caused by insufficient free or fragmented memory. ");`