Fix for errors when no GM campaigns are found

LaughingLeader-DOS2-Mods · Jul 18, 2021 · b070c2d · b070c2d
1 parent 1bc550f
commit b070c2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/GUI/MainWindow.xaml b/GUI/MainWindow.xaml
@@ -113,13 +113,15 @@
 									</TextBlock.Effect>
 								</TextBlock>
 								<Image
+									Width="16"
+									Height="16"
 									x:Name="ExpandImage"
 									Grid.Column="3"
 									RenderOptions.BitmapScalingMode="Fant"
 									Source="{StaticResource ExpandDownImage}"
 									Stretch="Uniform"
 									StretchDirection="UpOnly"
-									Visibility="{Binding ModUpdatesAvailable, Converter={StaticResource BoolToVisibilityConverter}, FallbackValue='Hidden'}" />
+									Visibility="{Binding ModUpdatesAvailable, Converter={StaticResource BoolToVisibilityConverter}, FallbackValue=Collapsed}" />
 							</Grid>
 						</Button.Content>
 					</Button>

diff --git a/GUI/ViewModels/MainWindowViewModel.cs b/GUI/ViewModels/MainWindowViewModel.cs
@@ -447,7 +447,10 @@ private void SetLoadedGMCampaigns(IEnumerable<DivinityGameMasterCampaign> data)
 			}
 
 			gameMasterCampaigns.Clear();
-			gameMasterCampaigns.AddRange(data);
+			if(data != null)
+			{
+				gameMasterCampaigns.AddRange(data);
+			}
 
 			DivinityGameMasterCampaign nextSelected = null;
 
@@ -1533,9 +1536,9 @@ public async Task<List<DivinityGameMasterCampaign>> LoadGameMasterCampaignsAsync
 			if (data != null)
 			{
 				data = data.OrderBy(m => m.Name).ToList();
+				DivinityApp.Log($"Loaded '{data.Count}' GM campaigns.");
 			}
 
-			DivinityApp.Log($"Loaded '{data.Count}' GM campaigns.");
 			return data;
 		}