Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt: Fix crash if loading an effect with no name. Also fix case of saving an effect with no name.

master
Per Inge Mathisen 2011-04-10 15:08:58 +02:00
parent 6b29965a1b
commit 75e389be38
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/effects.cpp
View File

@ -2569,7 +2569,7 @@ bool writeFXData(const char *fileName)
ini.setValue("radius", it->radius); ini.setValue("radius", it->radius);
const char *imd_name = resGetNamefromData("IMD", it->imd); const char *imd_name = resGetNamefromData("IMD", it->imd);
if (imd_name) if (imd_name && *imd_name)
{ {
ini.setValue("imd_name", imd_name); ini.setValue("imd_name", imd_name);
} }
@ -2618,7 +2618,11 @@ bool readFXData(const char *fileName)
curEffect->radius = ini.value("control").toInt(); curEffect->radius = ini.value("control").toInt();
if (ini.contains("imd_name")) if (ini.contains("imd_name"))
{ {
curEffect->imd = (iIMDShape*)resGetData("IMD", ini.value("imd_name").toString().toUtf8().constData()); QString imd_name = ini.value("imd_name").toString();
if (!imd_name.isEmpty())
{
curEffect->imd = (iIMDShape*)resGetData("IMD", imd_name.toUtf8().constData());
}
} }
else else
{ {