Merge pull request TrenchBroom#4341 from TrenchBroom/4340-fix-entity-…

…dragndrop 4340: Fix condition for accepting drag events in the tool chain
jjelliott · Sep 28, 2023 · 5ffdbbc · 5ffdbbc
2 parents a53b7db + da2ab64
commit 5ffdbbc
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/common/src/View/ToolChain.cpp b/common/src/View/ToolChain.cpp
@@ -181,11 +181,8 @@ bool ToolChain::shouldAcceptDrop(
   {
     return false;
   }
-  if (m_tool->toolActive())
-  {
-    return m_tool->shouldAcceptDrop(inputState, payload);
-  }
-  return m_suffix->shouldAcceptDrop(inputState, payload);
+  return (m_tool->toolActive() && m_tool->shouldAcceptDrop(inputState, payload))
+         || m_suffix->shouldAcceptDrop(inputState, payload);
 }
 
 std::unique_ptr<DropTracker> ToolChain::dragEnter(