diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-22 12:21:38 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-22 12:21:38 +0000 |
| commit | 9df0bd626eed33451e8eeebffcb393fb7ae0f0d8 (patch) | |
| tree | 28b81349c9174ee95e9d20ff460fdc11a27aafa7 /src/ui/tool/node.cpp | |
| parent | fix self-assignment. use of UNUSED macro to better show the intent of the code (diff) | |
| download | inkscape-9df0bd626eed33451e8eeebffcb393fb7ae0f0d8.tar.gz inkscape-9df0bd626eed33451e8eeebffcb393fb7ae0f0d8.zip | |
tool/node.cpp : don't rely on g_error terminating the program, allow more graceful error handling.
(bzr r13183)
Diffstat (limited to '')
| -rw-r--r-- | src/ui/tool/node.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index e246bf997..fbbc4be64 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -1217,6 +1217,7 @@ Handle *Node::handleToward(Node *to) return back(); } g_error("Node::handleToward(): second node is not adjacent!"); + return NULL; } Node *Node::nodeToward(Handle *dir) @@ -1228,6 +1229,7 @@ Node *Node::nodeToward(Handle *dir) return _prev(); } g_error("Node::nodeToward(): handle is not a child of this node!"); + return NULL; } Handle *Node::handleAwayFrom(Node *to) @@ -1239,6 +1241,7 @@ Handle *Node::handleAwayFrom(Node *to) return front(); } g_error("Node::handleAwayFrom(): second node is not adjacent!"); + return NULL; } Node *Node::nodeAwayFrom(Handle *h) @@ -1250,6 +1253,7 @@ Node *Node::nodeAwayFrom(Handle *h) return _next(); } g_error("Node::nodeAwayFrom(): handle is not a child of this node!"); + return NULL; } Glib::ustring Node::_getTip(unsigned state) const |