From: theadib <theadib@users.sourceforge.net>
Date: Sun, 1 Feb 2009 23:48:26 +0000 (+0000)
Subject: FIX for bug 317964; SVG crashes on empthy flow-text element
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=de2717c1a5fde3c9a8c5628536df6271be3f234c;p=inkscape.git

FIX for bug 317964; SVG crashes on empthy flow-text element
---

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();