Merge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge

[xonotic/netradiant.git] / radiant / csg.cpp

diff --git a/radiant/csg.cpp b/radiant/csg.cpp
index 59ea7e9c1b902cb40d64c368099f1287c13ad070..be01396d0fa3b75898f09effce1f61f8866b8575 100644 (file)
--- a/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@ -421,8 +421,9 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
                if ( brush != 0
                         && Instance_getSelectable( instance )->isSelected()
                         && path.size() > 1 ) {
+                       scene::Node& parent = path.parent();
                        Path_deleteTop( path );
-                       if( Node_getTraversable( path.parent() )->empty() ){
+                       if( Node_getTraversable( parent )->empty() ){
                                m_eraseParent = true;
                                //globalOutputStream() << "Empty node?!.\n";
                        }
@@ -652,8 +653,9 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
                                        }
                                        delete b;
                                }
+                               scene::Node& parent = path.parent();
                                Path_deleteTop( path );
-                               if( Node_getTraversable( path.parent() )->empty() ){
+                               if( Node_getTraversable( parent )->empty() ){
                                        m_eraseParent = true;
                                }
                        }