Browse Source

Merge pull request #3042 from Laserlicht/crash_preview

[fix] crash with custom campaign preview
Nordsoft91 2 years ago
parent
commit
802e1bb961
1 changed files with 2 additions and 2 deletions
  1. 2 2
      client/windows/CMapOverview.cpp

+ 2 - 2
client/windows/CMapOverview.cpp

@@ -149,7 +149,7 @@ CMapOverviewWidget::CMapOverviewWidget(CMapOverview& parent):
 
 	const JsonNode config(JsonPath::builtin("config/widgets/mapOverview.json"));
 
-	if(settings["lobby"]["mapPreview"].Bool())
+	if(settings["lobby"]["mapPreview"].Bool() && p.tabType != ESelectionScreen::campaignList)
 	{
 		ResourcePath res = ResourcePath(p.resource.getName(), EResType::MAP);
 		std::unique_ptr<CMap> campaignMap = nullptr;
@@ -192,7 +192,7 @@ CMapOverviewWidget::CMapOverviewWidget(CMapOverview& parent):
 	{
 		if(p.date.empty())
 		{
-			std::time_t time = boost::filesystem::last_write_time(*CResourceHandler::get()->getResourceName(ResourcePath(p.resource.getName(), EResType::MAP)));
+			std::time_t time = boost::filesystem::last_write_time(*CResourceHandler::get()->getResourceName(ResourcePath(p.resource.getName(), p.tabType == ESelectionScreen::campaignList ? EResType::CAMPAIGN : EResType::MAP)));
 			w->setText(vstd::getFormattedDateTime(time));
 		}
 		else