a

3 files changed, 3 insertions, 2 deletions

diff --git a/editor/app.hpp b/editor/app.hpp
index 4223f8c9..c9bfa966 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -45,7 +45,7 @@ enum class popup_target_type : unsigned char {
 };
 
 struct popup_target final {
-    std::shared_ptr<entity> e;
+    entity* e;
     popup_target_type target = popup_target_type::none;
     bool operator==(const popup_target&) const;
 };
diff --git a/editor/draw.cpp b/editor/draw.cpp
index ab9cb7ee..6d07f871 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -146,7 +146,6 @@ void app::draw_collision_boxes()
 
 void app::draw()
 {
-    //draw_character();
     if (_render_bboxes)
         draw_collision_boxes();
     if (_editor.current_tile_editor() || _editor.current_scenery_editor())
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
index 7fafc8d7..9a83d780 100644
--- a/editor/imgui.cpp
+++ b/editor/imgui.cpp
@@ -178,7 +178,9 @@ void app::kill_popups(bool hard)
 {
     const bool imgui = _imgui.context() != nullptr;
 
+    _pending_popup = false;
     _popup_target = {};
+
     if (imgui)
         ImGui::CloseCurrentPopup();