hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 05:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix crash on number workspace with null mon

Browse source
This commit is contained in:
vaxerski 2022-06-21 22:42:54 +02:00
parent 0b6c04355a
commit 48e33023af
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/helpers/MiscFunctions.cpp
View file

@ -158,6 +158,12 @@ int getWorkspaceIDFromString(const std::string& in, std::string& outName) {
outName = WORKSPACENAME; outName = WORKSPACENAME;
} else { } else {
if (in[0] == 'm') { if (in[0] == 'm') {
if (!g_pCompositor->m_pLastMonitor) {
Debug::log(ERR, "Relative monitor workspace on monitor null!");
result = INT_MAX;
return result;
}
// monitor relative // monitor relative
result = (int)getPlusMinusKeywordResult(in.substr(1), 0); result = (int)getPlusMinusKeywordResult(in.substr(1), 0);
@ -207,7 +213,14 @@ int getWorkspaceIDFromString(const std::string& in, std::string& outName) {
outName = g_pCompositor->getWorkspaceByID(currentID)->m_szName; outName = g_pCompositor->getWorkspaceByID(currentID)->m_szName;
} else { } else {
if (g_pCompositor->m_pLastMonitor)
result = std::clamp((int)getPlusMinusKeywordResult(in, g_pCompositor->m_pLastMonitor->activeWorkspace), 1, INT_MAX); result = std::clamp((int)getPlusMinusKeywordResult(in, g_pCompositor->m_pLastMonitor->activeWorkspace), 1, INT_MAX);
else if (isNumber(in))
result = std::clamp(std::stoi(in), 1, INT_MAX);
else {
Debug::log(ERR, "Relative workspace on no mon!");
result = INT_MAX;
}
outName = std::to_string(result); outName = std::to_string(result);
} }
} }