diff --git a/OutputGLCanvas.h b/OutputGLCanvas.h
index d0c940f..10c4e95 100644
--- a/OutputGLCanvas.h
+++ b/OutputGLCanvas.h
@@ -36,6 +36,9 @@ public:
   // Adjust viewable scene to correspond to absolute coordinates.
   void setSceneRectToViewportGeometry();
 
+  // Draws foreground (displays crosshair if needed).
+  void drawForeground(QPainter *painter , const QRectF &rect);
+
 public:
   void setDisplayCrosshair(bool displayCrosshair) {
     _displayCrosshair = displayCrosshair;
@@ -44,8 +47,6 @@ public:
   void setDisplayTestSignal(bool displayTestSignal) {
     _displayTestSignal = displayTestSignal;
   }
-  // Draws foreground (displays crosshair if needed).
-  void drawForeground(QPainter *painter , const QRectF &rect);
 
 private:
   void _drawTestSignal(QPainter* painter);
diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp
index 21941cb..d9ffbad 100644
--- a/OutputGLWindow.cpp
+++ b/OutputGLWindow.cpp
@@ -100,16 +100,7 @@ void OutputGLWindow::_updateToPreferredScreen()
 void OutputGLWindow::setDisplayCrosshair(bool crosshair)
 {
   canvas->setDisplayCrosshair(crosshair);
-
-  if (crosshair)
-  {
-//    this->setCursor(Qt::ArrowCursor);
-    setCursor(Qt::BlankCursor);
-  }
-  else
-  {
-    setCursor(Qt::ArrowCursor);
-  }
+  setCursor( crosshair ? Qt::BlankCursor : Qt::ArrowCursor );
 }
 
 void OutputGLWindow::setDisplayTestSignal(bool displayTestSignal)