summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-08-19 19:29:35 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-08-19 19:29:55 -0400
commit74c9df0c0798bb9fcc6f616e393a9edb01f3d0cb (patch)
tree942c096ddce499d35887fbcfcc496dbc584e641e
parentfixed default active_workspace, and more use of set_focused_container_for(...) (diff)
downloadsway-74c9df0c0798bb9fcc6f616e393a9edb01f3d0cb.tar.gz
sway-74c9df0c0798bb9fcc6f616e393a9edb01f3d0cb.tar.zst
sway-74c9df0c0798bb9fcc6f616e393a9edb01f3d0cb.zip
Fix error with workspace/output name matching
-rw-r--r--sway/container.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/container.c b/sway/container.c
index 0a75643d..9c6b78e9 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -54,7 +54,7 @@ static void free_swayc(swayc_t *c) {
54/* New containers */ 54/* New containers */
55 55
56static bool workspace_test(swayc_t *view, void *name) { 56static bool workspace_test(swayc_t *view, void *name) {
57 return strcasecmp(view->name, (char *)name); 57 return strcasecmp(view->name, (char *)name) == 0;
58} 58}
59 59
60swayc_t *new_output(wlc_handle handle) { 60swayc_t *new_output(wlc_handle handle) {
@@ -81,8 +81,10 @@ swayc_t *new_output(wlc_handle handle) {
81 sway_log(L_DEBUG, "Matched workspace to output: %s for %s", wso->workspace, wso->output); 81 sway_log(L_DEBUG, "Matched workspace to output: %s for %s", wso->workspace, wso->output);
82 // Check if any other workspaces are using this name 82 // Check if any other workspaces are using this name
83 if (find_container(&root_container, workspace_test, wso->workspace)) { 83 if (find_container(&root_container, workspace_test, wso->workspace)) {
84 sway_log(L_DEBUG, "But it's already taken");
84 break; 85 break;
85 } 86 }
87 sway_log(L_DEBUG, "So we're going to use it");
86 ws_name = strdup(wso->workspace); 88 ws_name = strdup(wso->workspace);
87 break; 89 break;
88 } 90 }