nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1608 from mh21/renaming-empty-ws-startup 

Update old_name when renaming current workspace
This commit is contained in:
Michael Stapelberg 2015-03-30 22:01:18 +02:00
parent cf5a98b8d7 f76e6c2bb1
commit 2759a308a2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/commands.c
View File

@ -1851,6 +1851,7 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
!strcasecmp(child->name, old_name)); !strcasecmp(child->name, old_name));
} else { } else {
workspace = con_get_workspace(focused); workspace = con_get_workspace(focused);
old_name = workspace->name;
} }
if (!workspace) { if (!workspace) {

5
testcases/t/175-startup-notification.t
View File

@ -155,6 +155,11 @@ cmd "rename workspace temp to $first_ws";
is_num_children($first_ws, 3, 'three containers on the first workspace'); is_num_children($first_ws, 3, 'three containers on the first workspace');
# empty 'from' workspaces should not crash the renaming of startup sequences
cmd "workspace $first_ws";
cmd "rename workspace to temp";
cmd "rename workspace to $first_ws";
# Switch to the first workspace and move the focused window to the # Switch to the first workspace and move the focused window to the
# second workspace. # second workspace.
cmd "workspace $first_ws"; cmd "workspace $first_ws";