diff --git a/WFInfo/Data.cs b/WFInfo/Data.cs index e70401eb..0108ef11 100644 --- a/WFInfo/Data.cs +++ b/WFInfo/Data.cs @@ -247,7 +247,14 @@ private bool LoadMarket(JObject allFiltered, bool force = false) } } } - ReloadItems(); + try + { + ReloadItems(); + } + catch + { + Main.AddLog("Failed to refresh items from warframe.market, skipping WFM update for now. Some items might have incomplete info."); + } marketData = new JObject(); WebClient webClient = CustomEntrypoint.createNewWebClient(); JArray rows = JsonConvert.DeserializeObject(webClient.DownloadString(sheetJsonUrl)); diff --git a/WFInfo/Main.cs b/WFInfo/Main.cs index b65599d7..3b084a68 100644 --- a/WFInfo/Main.cs +++ b/WFInfo/Main.cs @@ -92,8 +92,8 @@ private IServiceCollection ConfigureServices(IServiceCollection services) services.AddGDIScreenshots(); - // Only add windows capture on supported plarforms (W10+) - if (ApiInformation.IsTypePresent("Windows.Graphics.Capture.GraphicsCaptureSession")) + // Only add windows capture on supported plarforms (W10+ 2004 / Build 20348 and above) + if (ApiInformation.IsTypePresent("Windows.Graphics.Capture.GraphicsCaptureSession") && ApiInformation.IsPropertyPresent("Windows.Graphics.Capture.GraphicsCaptureSession", "IsBorderRequired")) { services.AddWindowsCaptureScreenshots(); } diff --git a/WFInfo/Properties/AssemblyInfo.cs b/WFInfo/Properties/AssemblyInfo.cs index 689d4510..df8839fe 100644 --- a/WFInfo/Properties/AssemblyInfo.cs +++ b/WFInfo/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 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("9.6.1.0")] -[assembly: AssemblyFileVersion("9.6.1.0")] +[assembly: AssemblyVersion("9.6.2.0")] +[assembly: AssemblyFileVersion("9.6.2.0")] diff --git a/WFInfo/WFInfo.csproj b/WFInfo/WFInfo.csproj index 0776045d..a82f6fde 100644 --- a/WFInfo/WFInfo.csproj +++ b/WFInfo/WFInfo.csproj @@ -73,7 +73,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -84,7 +84,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -102,7 +102,7 @@ - +