X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_selection.cpp;fp=src%2Fbase%2Frs_selection.cpp;h=60863ca1fc36e5ca0aa86ccae747311abdddb603;hb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;hp=fef508029f86becf8a903151c5d8fbb1fb6afea4;hpb=d86611a87f46873819dfae63f1112b248ba9aca1;p=architektonas

diff --git a/src/base/rs_selection.cpp b/src/base/rs_selection.cpp
index fef5080..60863ca 100644
--- 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 !!!"