Fixed segfault on closing.

GlPortal · Jan 9, 2018 · f53f592 · f53f592
1 parent 9150550
commit f53f592
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/include/radix/input/Channel.hpp b/include/radix/input/Channel.hpp
@@ -28,6 +28,8 @@ class Channel: public ChannelBase<T>, ChannelListener {
   void init(const int &id, EventDispatcher &event, const std::vector<Bind> &binds);
   void reInit(EventDispatcher &event);
 
+  void close();
+
   virtual void channelChanged(const int &id) override;
 
 private:
@@ -48,6 +50,8 @@ class SubChannel: public ChannelBase<T> {
   void init(const int &id, EventDispatcher &event, const Bind &bind);
   void reInit(EventDispatcher &event);
 
+  void close();
+
 private:
   void addObservers(EventDispatcher &event);
 

diff --git a/include/radix/input/InputManager.hpp b/include/radix/input/InputManager.hpp
@@ -37,6 +37,8 @@ class InputManager : public ChannelListener {
   void init();
   void reInit();
 
+  void close();
+
   virtual void channelChanged(const int &id) override;
   Vector2f getPlayerMovementVector() const;
 

diff --git a/source/BaseGame.cpp b/source/BaseGame.cpp
@@ -142,9 +142,10 @@ void BaseGame::removeHook() { }
 void BaseGame::customTriggerHook() { }
 
 void BaseGame::cleanUp() {
-        removeHook();
-        setWorld({});
-        window.close();
+  removeHook();
+  inputManager.close();
+  setWorld({});
+  window.close();
 }
 
 void BaseGame::render() {

diff --git a/source/input/Channel.cpp b/source/input/Channel.cpp
@@ -42,6 +42,13 @@ void Channel<T>::reInit(EventDispatcher &event) {
   }
 }
 
+template<class T>
+void Channel<T>::close() {
+  for (SubChannel<T> &subChannel : subChannels) {
+    subChannel.close();
+  }
+}
+
 template<class T>
 void Channel<T>::channelChanged(const int &id) {
   this->Channel<T>::set(this->subChannels.at(id).SubChannel<T>::get());
@@ -79,6 +86,13 @@ void SubChannel<T>::reInit(EventDispatcher &event) {
   this->addObservers(event);
 }
 
+template<class T>
+void SubChannel<T>::close() {
+  for (EventDispatcher::CallbackHolder& callback : callbacks) {
+    callback.removeThis();
+  }
+}
+
 template<class T>
 void SubChannel<T>::addObservers(EventDispatcher &event) {
   switch (bind.inputType) {

diff --git a/source/input/InputManager.cpp b/source/input/InputManager.cpp
@@ -47,6 +47,16 @@ void InputManager::reInit() {
   }
 }
 
+void InputManager::close() {
+  for (auto& el : analogueChannels) {
+    el.second.close();
+  }
+
+  for (auto& el : digitalChannels) {
+    el.second.close();
+  }
+}
+
 void InputManager::channelChanged(const int &id) {
   entities::Player& player = game.getWorld()->getPlayer();