From bc662aeb63ad928934e78da9f28bf4377ac04fea Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Wed, 13 Dec 2023 16:06:12 -0600 Subject: [PATCH] Fix(CS): Fix minor issue in deleteSelectedInstances impl which caused it to run twice --- apps/opencs/view/render/instancemode.cpp | 5 ++--- apps/opencs/view/render/instancemode.hpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp index f55bc9a8e8..7332d9c84b 100644 --- a/apps/opencs/view/render/instancemode.cpp +++ b/apps/opencs/view/render/instancemode.cpp @@ -202,8 +202,7 @@ CSVRender::InstanceMode::InstanceMode( connect(this, &InstanceMode::requestFocus, worldspaceWidget, &WorldspaceWidget::requestFocus); CSMPrefs::Shortcut* deleteShortcut = new CSMPrefs::Shortcut("scene-delete", worldspaceWidget); - connect( - deleteShortcut, qOverload(&CSMPrefs::Shortcut::activated), this, &InstanceMode::deleteSelectedInstances); + connect(deleteShortcut, qOverload<>(&CSMPrefs::Shortcut::activated), this, &InstanceMode::deleteSelectedInstances); CSMPrefs::Shortcut* duplicateShortcut = new CSMPrefs::Shortcut("scene-duplicate", worldspaceWidget); @@ -1075,7 +1074,7 @@ void CSVRender::InstanceMode::handleSelectDrag(const QPoint& pos) mDragMode = DragMode_None; } -void CSVRender::InstanceMode::deleteSelectedInstances(bool active) +void CSVRender::InstanceMode::deleteSelectedInstances() { std::vector> selection = getWorldspaceWidget().getSelection(Mask_Reference); if (selection.empty()) diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp index 67af7854ef..917fde301a 100644 --- a/apps/opencs/view/render/instancemode.hpp +++ b/apps/opencs/view/render/instancemode.hpp @@ -131,7 +131,7 @@ namespace CSVRender private slots: void subModeChanged(const std::string& id); - void deleteSelectedInstances(bool active); + void deleteSelectedInstances(); void cloneSelectedInstances(); void dropSelectedInstancesToCollision(); void dropSelectedInstancesToTerrain();