* Fixed a warning.

* fStyleMap could be deleted more than once in certain situations.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28563 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-11-08 13:22:33 +00:00
parent 3d198cd3ae
commit 3bd8c2318f
@@ -254,17 +254,15 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs)
return B_CANCELED;
}
StyleContainer* styles = icon->Styles();
// import run colors as styles
if (runs) {
delete[] fStyleMap;
fStyleMap = new struct style_map[runs->count];
for (int32 i = 0; runs && i < runs->count; i++) {
_AddStyle(icon, &runs->runs[i]);
}
}
int32 currentRun = 0;
text_run *run = NULL;
if (runs)
@@ -344,6 +342,7 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs)
}
delete[] fStyleMap;
fStyleMap = NULL;
return B_OK;
}