From 29d017f54bc4b41ec402e6ac91d4857b8305483a Mon Sep 17 00:00:00 2001 From: MightyPlaza <123664421+MightyPlaza@users.noreply.github.com> Date: Tue, 11 Jul 2023 09:29:19 +0000 Subject: monitor desc default workspace but working now (#2678) * fix desc check * fixes crashes when nulptr --- src/Compositor.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Compositor.cpp') diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 89c0d08b..445e2e04 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -495,17 +495,14 @@ CMonitor* CCompositor::getMonitorFromName(const std::string& name) { return m.get(); } } - return nullptr; } CMonitor* CCompositor::getMonitorFromDesc(const std::string& desc) { for (auto& m : m_vMonitors) { - if (desc == m->output->description) { + if (m->output->description && std::string(m->output->description).find(desc) == 0) return m.get(); - } } - return nullptr; } -- cgit v1.2.3