Sanity check step 1: Renaming files...

[architektonas] / src / base / rs_selection.cpp

diff --git a/src/base/rs_selection.cpp b/src/base/rs_selection.cpp
index fef508029f86becf8a903151c5d8fbb1fb6afea4..60863ca1fc36e5ca0aa86ccae747311abdddb603 100644 (file)
--- a/src/base/rs_selection.cpp
+++ b/src/base/rs_selection.cpp
@@ -16,10 +16,11 @@
 
 #include "rs_selection.h"
 
+#include "drawing.h"
+#include "rs_entity.h"
+#include "graphicview.h"
 #include "rs_information.h"
 #include "rs_polyline.h"
-#include "rs_entity.h"
-#include "drawing.h"
 
 /**
  * Default constructor.
@@ -40,7 +41,7 @@ RS_Selection::RS_Selection(RS_EntityContainer & container, GraphicView * graphic
  */
 void RS_Selection::selectSingle(RS_Entity * e)
 {
-       if (e != NULL && (e->getLayer() == NULL || e->getLayer()->isLocked() == false))
+       if (e && (e->getLayer() == NULL || e->getLayer()->isLocked() == false))
        {
 // Same problem as below...
 //[WAS]#warning "!!! This is causing a segfault in the draw code !!!"