From 53d435006c3f696a31027a6e552a7563532a79ac Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 14 Jan 2014 10:07:26 -0800
Subject: [PATCH] more follow mode cleanup, fix silent node iterator

---
 interface/src/Application.cpp     | 5 -----
 interface/src/Application.h       | 2 --
 libraries/shared/src/NodeList.cpp | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d3d49497d2..35b61ae95c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -274,7 +274,6 @@ Application::~Application() {
 
     delete _logger;
     delete _settings;
-    delete _followMode;
     delete _glWidget;
 }
 
@@ -1913,10 +1912,6 @@ void Application::init() {
                   _glWidget->width(),
                   _glWidget->height());
 
-    _followMode = new QAction(this);
-    connect(_followMode, SIGNAL(triggered()), this, SLOT(toggleFollowMode()));
-    _pieMenu.addAction(_followMode);
-
     _audio.init(_glWidget);
 
     _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 8aa4f40f7f..98ba60cc5d 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -335,8 +335,6 @@ private:
     QMainWindow* _window;
     QGLWidget* _glWidget;
 
-    QAction* _followMode;
-
     BandwidthMeter _bandwidthMeter;
 
     SerialInterface _serialHeadSensor;
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index ef295da7a8..91afb66db0 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -807,6 +807,8 @@ void NodeList::removeSilentNodes() {
         
         // unlock the node
         node->unlock();
+        
+        nodeItem++;
     }
 }