workspace: fix relative workspaces with monitor descs
This commit is contained in:
parent
059ec60e9f
commit
91f592a875
1 changed files with 2 additions and 2 deletions
|
|
@ -148,7 +148,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) {
|
||||||
std::set<WORKSPACEID> invalidWSes;
|
std::set<WORKSPACEID> invalidWSes;
|
||||||
if (same_mon) {
|
if (same_mon) {
|
||||||
for (auto const& rule : g_pConfigManager->getAllWorkspaceRules()) {
|
for (auto const& rule : g_pConfigManager->getAllWorkspaceRules()) {
|
||||||
const auto PMONITOR = g_pCompositor->getMonitorFromName(rule.monitor);
|
const auto PMONITOR = g_pCompositor->getMonitorFromString(rule.monitor);
|
||||||
if (PMONITOR && (PMONITOR->m_id != g_pCompositor->m_lastMonitor->m_id))
|
if (PMONITOR && (PMONITOR->m_id != g_pCompositor->m_lastMonitor->m_id))
|
||||||
invalidWSes.insert(rule.workspaceId);
|
invalidWSes.insert(rule.workspaceId);
|
||||||
}
|
}
|
||||||
|
|
@ -227,7 +227,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (auto const& rule : g_pConfigManager->getAllWorkspaceRules()) {
|
for (auto const& rule : g_pConfigManager->getAllWorkspaceRules()) {
|
||||||
const auto PMONITOR = g_pCompositor->getMonitorFromName(rule.monitor);
|
const auto PMONITOR = g_pCompositor->getMonitorFromString(rule.monitor);
|
||||||
if (!PMONITOR || PMONITOR->m_id == g_pCompositor->m_lastMonitor->m_id) {
|
if (!PMONITOR || PMONITOR->m_id == g_pCompositor->m_lastMonitor->m_id) {
|
||||||
// Can't be invalid
|
// Can't be invalid
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue