summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2021-07-11 14:26:18 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2021-09-01 16:46:04 +0100
commitd18686233868d81b0c22d554714c4171cf83a509 (patch)
treec1fe0158277b8192d5f561062f550901fe2aeb1c /core
parent55a20129d691691aa811dd0820f70e56560d35c7 (diff)
Fix InputMap and display server not nulling singleton on free
Diffstat (limited to 'core')
-rw-r--r--core/input/input_map.cpp4
-rw-r--r--core/input/input_map.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index c7ca65f61a..ebab1d12fd 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -746,3 +746,7 @@ InputMap::InputMap() {
ERR_FAIL_COND_MSG(singleton, "Singleton in InputMap already exist.");
singleton = this;
}
+
+InputMap::~InputMap() {
+ singleton = nullptr;
+}
diff --git a/core/input/input_map.h b/core/input/input_map.h
index a2d3952f94..c724fdb142 100644
--- a/core/input/input_map.h
+++ b/core/input/input_map.h
@@ -95,6 +95,7 @@ public:
const OrderedHashMap<String, List<Ref<InputEvent>>> &get_builtins();
InputMap();
+ ~InputMap();
};
#endif // INPUT_MAP_H