summaryrefslogtreecommitdiff
diff options
-rw-r--r--launcher/SwitcherController.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/launcher/SwitcherController.cpp b/launcher/SwitcherController.cpp
index 6cbe798a7..fc9cd6807 100644
--- a/launcher/SwitcherController.cpp
+++ b/launcher/SwitcherController.cpp
@@ -547,17 +547,16 @@ Selection Controller::Impl::GetCurrentSelection() const
if (model_)
{
application = model_->Selection();
+
if (application)
{
if (model_->detail_selection)
{
window = model_->DetailSelectionWindow();
}
- else if (application->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE))
+ else if (model_->SelectionIsActive())
{
- auto const& xids = model_->DetailXids();
- if (!xids.empty())
- window = xids.front();
+ window = model_->DetailXids().front();
}
}
}