From 3bd8c2318fb2b259a5b0f36f9f8392738b593871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 8 Nov 2008 13:22:33 +0000 Subject: [PATCH] * 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 --- .../import_export/styled_text/StyledTextImporter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp index 1fe8dfee31..208a61baa4 100644 --- a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp +++ b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp @@ -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; }