From 2d287cce130d83d1343ee5c985218e62614ada50 Mon Sep 17 00:00:00 2001
From: Dendraspis <dendraspis@gmx.net>
Date: Sun, 12 Mar 2023 12:35:27 +0100
Subject: [PATCH] Fix misleading language name fetch from path for subtitles

---
 Changelog.md                      | 38 +++++++++++++++++++++----------
 Source/General/Misc.vb            |  4 ++++
 Source/My Project/AssemblyInfo.vb |  4 ++--
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9ec9696d..7331e8b1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,26 +9,40 @@ v2.15.0 (not published yet)
 - Update VapourSynth plugins
 -->
 
+v2.15.0 (not published yet)
+====================
+
+- Fix misleading language name fetch from path for subtitles ([#924](/../../issues/924))
+- Update tools
+    - ...
+- Update AviSynth+ plugins
+    - ...
+- Update Dual plugins
+    - ...
+- Update VapourSynth plugins
+    - ...
+
+
 v2.14.0 (2023-03-12)
 ====================
 
 - NVEnc: Add multiple new params
-- NVEnc: Add missing/new options for "--vpp-resize" ([#964](/../../issues/964))
+- NVEnc: Add missing/new options for "--vpp-resize" ([#921](/../../issues/921)), ([#964](/../../issues/964))
 - VCEEnc: Add multiple new params
 - x265: Fixed missing option for "--display-window"
 - Fix AVS mClean not working properly due to Masktools update
 - Fix AVS QTGMC not working properly
 - Fix AVS SMDegrain not working properly due to missing dependencies ([#931](/../../issues/931))
 - Update tools
-  - AOMEnc v3.2.0-393-g402e264b9-x64-gcc11.3.0 Patman
-  - MediaInfo v22.12
-  - MKVToolNix v74.0
-  - MP4Box v2.1-DEV-rev79-gdf29bc8a0-x64-gcc11.3.0 Patman
-  - NVEnc v7.20
-  - QSVEnc v7.35
-  - Rav1e v0.5.0-(p20220426-4-gb5c76736)-x64-gcc11.3.0 Patman
-  - SvtAv1EncApp v1.0.0-4-g879ba80a-x64-msvc1931 Patman
-  - VCEEnc v8.10
+    - AOMEnc v3.2.0-393-g402e264b9-x64-gcc11.3.0 Patman
+    - MediaInfo v22.12
+    - MKVToolNix v74.0
+    - MP4Box v2.1-DEV-rev79-gdf29bc8a0-x64-gcc11.3.0 Patman
+    - NVEnc v7.20
+    - QSVEnc v7.35
+    - Rav1e v0.5.0-(p20220426-4-gb5c76736)-x64-gcc11.3.0 Patman
+    - SvtAv1EncApp v1.0.0-4-g879ba80a-x64-msvc1931 Patman
+    - VCEEnc v8.10
 - Update AviSynth+ plugins
     - ExTools v10.0
     - ModPlus v2020-06-26
@@ -36,8 +50,8 @@ v2.14.0 (2023-03-12)
     - Sharpeners Pack v5.0
     - SMDegrain v4.0.0.d
 - Update Dual plugins
-  - DGMPGDec v2.0.0.7 (replace wrong version in v2.13.0)
-  - ffms2 v3.0.1.0 1329+20 ad42af1 StvG
+    - DGMPGDec v2.0.0.7 (replace wrong version in v2.13.0)
+    - ffms2 v3.0.1.0 1329+20 ad42af1 StvG
 
 
 v2.13.0 (2022-05-10)
diff --git a/Source/General/Misc.vb b/Source/General/Misc.vb
index b1ddefbd..ce421e4a 100644
--- a/Source/General/Misc.vb
+++ b/Source/General/Misc.vb
@@ -1364,6 +1364,10 @@ Public Class Subtitle
             For Each lng In Language.Languages
                 If path.Contains(lng.CultureInfo.EnglishName) Then
                     st.Language = lng
+                End If
+
+                If path.FileName.Contains(lng.CultureInfo.EnglishName) Then
+                    st.Language = lng
                     Exit For
                 End If
             Next
diff --git a/Source/My Project/AssemblyInfo.vb b/Source/My Project/AssemblyInfo.vb
index 9157aa34..6e2f4b02 100644
--- a/Source/My Project/AssemblyInfo.vb	
+++ b/Source/My Project/AssemblyInfo.vb	
@@ -7,6 +7,6 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCopyright("Copyright (C) 2002-2023 StaxRip Authors")>
 <Assembly: ComVisible(False)> 
 <Assembly: Guid("54d5dc0f-6ba7-42f0-a82f-9c71d561cb8b")>
-<Assembly: AssemblyVersion("2.14.0")>
-<Assembly: AssemblyFileVersion("2.14.0")>
+<Assembly: AssemblyVersion("2.14.1")>
+<Assembly: AssemblyFileVersion("2.14.1")>
 <Assembly: AssemblyDescription("Video encoding app")>