Merge branch 'master' into 'release'

Release 2.2.4 See merge request voltstro-studios/uwb/unitywebbrowser!7
Voltstro-Studios · Oct 26, 2024 · cca549e · cca549e
2 parents fe8bbac + a9d9762
commit cca549e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.4] - 2024-10-26
+
+### Fixed
+
+- Fix Windows job handle names being the same (#358)
+
 ## [2.2.3] - 2024-10-20
 
 ### Added

diff --git a/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs b/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.3")]
-[assembly: AssemblyFileVersion("2.2.3")]
+[assembly: AssemblyVersion("2.2.4")]
+[assembly: AssemblyFileVersion("2.2.4")]
 
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Prj")]
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Editor")]

diff --git a/src/Packages/UnityWebBrowser/Runtime/Core/Engines/Process/WindowProcess.cs b/src/Packages/UnityWebBrowser/Runtime/Core/Engines/Process/WindowProcess.cs
@@ -21,7 +21,7 @@ public WindowProcess()
         {
             //Job handle code from SO
             //https://stackoverflow.com/questions/3342941/kill-child-process-when-parent-process-is-killed
-            string jobName = "UWBChildProcesses" + System.Diagnostics.Process.GetCurrentProcess().Id;
+            string jobName = "UWBChildProcesses" + Guid.NewGuid().ToString("N");
             jobHandle = CreateJobObject(IntPtr.Zero, jobName);
 
             JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()

diff --git a/src/Packages/UnityWebBrowser/package.json b/src/Packages/UnityWebBrowser/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser",
   "displayName": "Unity Web Browser",
   "description": "Unity Web Browser (UWB) is a Unity package that allows displaying and interacting with the web from within Unity.",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",

diff --git a/src/version.json b/src/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "publicReleaseRefSpec": [
     "^refs/heads/release$"
   ],