summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdib Taraben <theadib@gmail.com>2009-02-01 23:48:26 +0000
committertheadib <theadib@users.sourceforge.net>2009-02-01 23:48:26 +0000
commit03297cf37457607400f5ec143457aa4ae3041ce6 (patch)
tree9aa93d5680a81b61256e6a70ed2ffe12614f1c7b /src
parentbug fix: handle paths with more than one component. (diff)
downloadinkscape-03297cf37457607400f5ec143457aa4ae3041ce6.tar.gz
inkscape-03297cf37457607400f5ec143457aa4ae3041ce6.zip
FIX for bug 317964; SVG crashes on empthy flow-text element
(bzr r7212)
Diffstat (limited to 'src')
-rw-r--r--src/libnrtype/Layout-TNG-Compute.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp
index 2e65c2b24..7a2924d98 100644
--- a/src/libnrtype/Layout-TNG-Compute.cpp
+++ b/src/libnrtype/Layout-TNG-Compute.cpp
@@ -1345,10 +1345,16 @@ bool Layout::Calculator::calculate()
{
if (_flow._input_stream.empty())
return false;
- g_assert(_flow._input_stream.front()->Type() == TEXT_SOURCE);
+ /**
+ * hm, why do we want assert (crash) the application, now do simply return false
+ * \todo check if this is the correct behaviour
+ * g_assert(_flow._input_stream.front()->Type() == TEXT_SOURCE);
+ */
if (_flow._input_stream.front()->Type() != TEXT_SOURCE)
+ {
+ g_warning("flow text is not of type TEXT_SOURCE. Abort.");
return false;
-
+ }
TRACE(("begin calculateFlow()\n"));
_flow._clearOutputObjects();