Font ImGui fix, song existence fix

slotthhy · Mar 18, 2024 · 64c0804 · 64c0804
1 parent 16eb61e
commit 64c0804
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Orchestrion/Orchestrion.csproj b/Orchestrion/Orchestrion.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
-    <PluginVersion>2.2.0.3</PluginVersion>
+    <PluginVersion>2.2.0.4</PluginVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Orchestrion/OrchestrionPlugin.cs b/Orchestrion/OrchestrionPlugin.cs
@@ -101,7 +101,7 @@ public OrchestrionPlugin(DalamudPluginInterface pi)
 			DalamudApi.PluginLog.Debug(CnFont.LoadException.StackTrace);	
 		}
 
-		LargeFont = atlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, 24 * ImGuiHelpers.GlobalScale));
+		LargeFont = atlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, 24));
 	}
 
 	public static void LanguageChanged(string code)

diff --git a/Orchestrion/Util.cs b/Orchestrion/Util.cs
@@ -53,8 +53,9 @@ public static bool SearchMatches(string searchText, Song song)
 			matchesSearch |= song.Id.ToString().Contains(searchText);
 
 			// Localized addtl info check
-			var strings = song.Strings["en"];
-			song.Strings.TryGetValue(lang, out strings);
+			if (!song.Strings.TryGetValue(lang, out var strings)) {
+				strings = song.Strings["en"];
+			}
 			matchesSearch |= strings.Locations.ToLower().Contains(searchText.ToLower());
 			matchesSearch |= strings.AdditionalInfo.ToLower().Contains(searchText.ToLower());
 		}