From 4b2f51f2f02575744cb02b1e4c92c4157207172a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 9 Jan 2013 14:21:01 +0000 Subject: [PATCH] Fixed polyline merge crash, when picked object is not a poly line closes #1376 git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16071 383ad7c9-94d9-4d36-a494-682f7c89f535 --- PolyLinePlugin.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PolyLinePlugin.cc b/PolyLinePlugin.cc index 509935b..9594c4a 100644 --- a/PolyLinePlugin.cc +++ b/PolyLinePlugin.cc @@ -993,7 +993,7 @@ me_merge( QMouseEvent* _event ) if (PluginFunctions::getPickedObject(node_idx, obj)) { // is picked object polyline? PolyLineObject* cur_pol = PluginFunctions::polyLineObject(obj); - if (cur_pol) + if (cur_pol) { // Check if we got a line segment or a vertex if ( target_idx >= cur_pol->line()->n_vertices() ) @@ -1012,6 +1012,8 @@ me_merge( QMouseEvent* _event ) // cur_pol->line()->add_point( cur_pol->line()->point( cur_pol->line()->n_vertices()-1)); move_point_ref_ = &(cur_pol->line()->point(cur_pol->line()->n_vertices() - 1)); } + } + } } } -- GitLab