games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

- fixed crash on missing videos

Browse Source 
- fixed savegames name selection
This commit is contained in:
Ivan Savenko
2012-08-11 11:34:49 +00:00
parent edbc7f1223
commit eec4d3579d
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/CVideoHandler.cpp
View File

@@ -685,12 +685,20 @@ bool CVideoPlayer::open(std::string fname, bool loop, bool useOverlay)
refreshCount = -1;
doLoop = loop;
auto extracted = CResourceHandler::get()->loadData(ResourceID(std::string("Video/") + fname, EResType::VIDEO));
data = (char *)extracted.first.release();
length = extracted.second;
ResourceID resource(std::string("Video/") + fname, EResType::VIDEO);
if (!data)
if (CResourceHandler::get()->existsResource(resource))
{
auto extracted = CResourceHandler::get()->loadData(resource);
data = (char *)extracted.first.release();
length = extracted.second;
}
else
{
data = nullptr;
length = 0;
return false;
}
std::string filePath;
filePath.resize(100);