Trensa-Organization/split-monitor-workspaces
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/split-monitor-workspaces.git synced 2025-03-15 11:13:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixes #1: catch exception if workspace not an integer

Browse source
This commit is contained in:
zjeffer 2023-06-18 12:13:53 +02:00 • committed by Stanisław Zagórowski
parent 698c1510e3
commit c152797c2b
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main.cpp
View file

@ -1,8 +1,8 @@
#include <hyprland/src/helpers/Color.hpp>
#include <hyprland/src/managers/KeybindManager.hpp>
#include <hyprland/src/Compositor.hpp> #include <hyprland/src/Compositor.hpp>
#include <hyprland/src/config/ConfigManager.hpp> #include <hyprland/src/config/ConfigManager.hpp>
#include <hyprland/src/helpers/Color.hpp>
#include <hyprland/src/helpers/Workspace.hpp> #include <hyprland/src/helpers/Workspace.hpp>
#include <hyprland/src/managers/KeybindManager.hpp>
#include "globals.hpp" #include "globals.hpp"
@ -22,16 +22,25 @@ static HOOK_CALLBACK_FN* e_monitorRemovedHandle = nullptr;
const std::string& getWorkspaceFromMonitor(CMonitor* monitor, const std::string& workspace) const std::string& getWorkspaceFromMonitor(CMonitor* monitor, const std::string& workspace)
{ {
int workspaceIndex = std::stoi(workspace); int workspaceIndex = 0;
if (workspaceIndex - 1 < 0) { try {
// convert to 0-indexed int
workspaceIndex = std::stoi(workspace) - 1;
}
catch (std::invalid_argument) {
Debug::log(WARN, "Invalid workspace index: %s", workspace.c_str());
return workspace; return workspace;
} }
if (workspaceIndex - 1 >= g_vMonitorWorkspaceMap[monitor->ID].size()) { if (workspaceIndex < 0) {
return workspace; return workspace;
} }
return g_vMonitorWorkspaceMap[monitor->ID][workspaceIndex - 1]; if (workspaceIndex >= g_vMonitorWorkspaceMap[monitor->ID].size()) {
return workspace;
}
return g_vMonitorWorkspaceMap[monitor->ID][workspaceIndex];
} }
void monitorWorkspace(std::string workspace) void monitorWorkspace(std::string workspace)