edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1100 from minus7/mapversion-editor-crash

Browse source 
Loading map with invalid version crashes editor
This commit is contained in:
oy 2013-06-01 04:08:10 -07:00
parent 614020de6e ee9a8ce4b7
commit 8faf175951
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/editor/editor.cpp
View file

@ -711,6 +711,11 @@ void CEditor::CallbackOpenMap(const char *pFileName, int StorageType, void *pUse
pEditor->m_Dialog = DIALOG_NONE;
pEditor->m_Map.m_Modified = false;
}
else
{
pEditor->Reset();
pEditor->m_aFileName[0] = 0;
}
}
void CEditor::CallbackAppendMap(const char *pFileName, int StorageType, void *pUser)
{

3
src/game/editor/io.cpp
View file

@ -435,6 +435,7 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag
editor->reset();
editor_load_old(df, this);
*/
return 0;
}
else if(pItem->m_Version == 1)
{
@ -650,6 +651,8 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag
}
}
}
else
return 0;
return 1;
}