mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix error with workspace/output name matching

Browse source
This commit is contained in:
Drew DeVault 2015-08-19 19:29:35 -04:00
parent 6f424ff6b8
commit 74c9df0c07
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/container.c
View file

@ -54,7 +54,7 @@ static void free_swayc(swayc_t *c) {
/* New containers */ /* New containers */
static bool workspace_test(swayc_t *view, void *name) { static bool workspace_test(swayc_t *view, void *name) {
return strcasecmp(view->name, (char *)name); return strcasecmp(view->name, (char *)name) == 0;
} }
swayc_t *new_output(wlc_handle handle) { swayc_t *new_output(wlc_handle handle) {
@ -81,8 +81,10 @@ swayc_t *new_output(wlc_handle handle) {
sway_log(L_DEBUG, "Matched workspace to output: %s for %s", wso->workspace, wso->output); sway_log(L_DEBUG, "Matched workspace to output: %s for %s", wso->workspace, wso->output);
// Check if any other workspaces are using this name // Check if any other workspaces are using this name
if (find_container(&root_container, workspace_test, wso->workspace)) { if (find_container(&root_container, workspace_test, wso->workspace)) {
sway_log(L_DEBUG, "But it's already taken");
break; break;
} }
sway_log(L_DEBUG, "So we're going to use it");
ws_name = strdup(wso->workspace); ws_name = strdup(wso->workspace);
break; break;
} }