From Jaap Gas, added missing break, and missing removeDraggerCallback.

2012-05-24 18:15:44 +00:00
parent 759a889468
commit a28907a67f
2 changed files with 128 additions and 0 deletions
--- a/src/osgManipulator/Dragger.cpp
+++ b/src/osgManipulator/Dragger.cpp
@@ -275,6 +275,19 @@ void Dragger::addDraggerCallback(DraggerCallback* dc)

 void Dragger::removeDraggerCallback(DraggerCallback* dc)
 {
+    for(Dragger::DraggerCallbacks::iterator itr = _draggerCallbacks.begin();
+        itr != _draggerCallbacks.end();
+        )
+    {
+        if (dc==itr->get())
+        {
+            itr = _draggerCallbacks.erase(itr);
+        }
+        else
+        {
+            ++itr;
+        }
+    }
 }


@@ -390,6 +403,7 @@ bool Dragger::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter&
                        }
                    }
                }
+                break;
            }
            case osgGA::GUIEventAdapter::DRAG:
            case osgGA::GUIEventAdapter::RELEASE: