vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed crash when loading a file while demo is running

Browse Source 
Also fixed that loading of folded that was broken.

Closes #61
This commit is contained in:
Daniel Collin 2013-01-07 23:36:24 +01:00
parent 2ff3863097
commit 9e7818b6dd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ogl_editor/src/loadsave.c
View File

@ -10,7 +10,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static const char* s_foldedGroupNames[16 * 1024]; static char* s_foldedGroupNames[16 * 1024];
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -48,7 +48,7 @@ static void parseXml(mxml_node_t* rootNode, TrackData* trackData)
if (!strcmp("group", element_name)) if (!strcmp("group", element_name))
{ {
s_foldedGroupNames[foldedGroupCount++] = mxmlElementGetAttr(node, "name"); s_foldedGroupNames[foldedGroupCount++] = strdup(mxmlElementGetAttr(node, "name"));
} }
if (!strcmp("tracks", element_name)) if (!strcmp("tracks", element_name))
@ -143,12 +143,23 @@ static void parseXml(mxml_node_t* rootNode, TrackData* trackData)
{ {
for (g = 0; g < trackData->groupCount; ++g) for (g = 0; g < trackData->groupCount; ++g)
{ {
if (!strcmp(s_foldedGroupNames[i], trackData->groups[g].name)) Group* group = &trackData->groups[g];
const char* groupName = group->name;
const char* foldedName = s_foldedGroupNames[i];
// groups with 1 track is handled as non-grouped
if (group->trackCount == 1)
continue;
if (!strcmp(foldedName, groupName))
{ {
trackData->groups[i].folded = true; trackData->groups[g].folded = true;
break; break;
} }
} }
free(s_foldedGroupNames[i]);
} }
trackData->tracks[0].selected = true; trackData->tracks[0].selected = true;