games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #3042 from Laserlicht/crash_preview

Browse Source 
[fix] crash with custom campaign preview
This commit is contained in:
Nordsoft91
2023-10-13 10:57:02 +02:00
committed by GitHub
parent 093c8149e5 abab917ef9
commit 802e1bb961
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/windows/CMapOverview.cpp
View File

@@ -149,7 +149,7 @@ CMapOverviewWidget::CMapOverviewWidget(CMapOverview& parent):
const JsonNode config(JsonPath::builtin("config/widgets/mapOverview.json")); 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); ResourcePath res = ResourcePath(p.resource.getName(), EResType::MAP);
std::unique_ptr<CMap> campaignMap = nullptr; std::unique_ptr<CMap> campaignMap = nullptr;
@@ -192,7 +192,7 @@ CMapOverviewWidget::CMapOverviewWidget(CMapOverview& parent):
{ {
if(p.date.empty()) 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)); w->setText(vstd::getFormattedDateTime(time));
} }
else else