Merge branch 'hotfix/1.9.1'

fmauNeko · Nov 23, 2024 · 313edf5 · 313edf5
2 parents 7b42881 + 9de6f1e
commit 313edf5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/MarketBoardPlugin/MBPlugin.cs b/MarketBoardPlugin/MBPlugin.cs
@@ -271,15 +271,21 @@ private void OnContextMenuOpened(IMenuOpenedArgs args)
         return;
       }
 
-      var item = this.DataManager.Excel.GetSheet<Item>()?.GetRow(itemId);
+      var item = this.DataManager.Excel.GetSheet<Item>().GetRowOrDefault(itemId);
+
+      if (!item.HasValue)
+      {
+        this.Log.Warning("Failed to get item data for item ID {0}", itemId);
+        return;
+      }
 
       args.AddMenuItem(new MenuItem
       {
         Name = "Search in Market Board",
         OnClicked = this.GetMenuItemClickedHandler(itemId),
         Prefix = SeIconChar.BoxedLetterM,
         PrefixColor = 48,
-        IsEnabled = !(item?.IsUntradable ?? true),
+        IsEnabled = !item.Value.IsUntradable,
       });
     }
 

diff --git a/MarketBoardPlugin/MarketBoardPlugin.csproj b/MarketBoardPlugin/MarketBoardPlugin.csproj
@@ -5,9 +5,9 @@
     <DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
     <DebugType>PdbOnly</DebugType>
     <GenerateFullPaths>true</GenerateFullPaths>
-    <AssemblyVersion>1.9.0</AssemblyVersion>
-    <FileVersion>1.9.0</FileVersion>
-    <Version>1.9.0</Version>
+    <AssemblyVersion>1.9.1</AssemblyVersion>
+    <FileVersion>1.9.1</FileVersion>
+    <Version>1.9.1</Version>
     <Company>Florian Maunier</Company>
     <Description>Market board plugin for Dalamud.</Description>
     <Copyright>Copyright (c) Florian Maunier. All rights reserved.</Copyright>
@@ -49,4 +49,4 @@
     <ProjectReference Include="..\OtterGui\OtterGui.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>