koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Stapelberg
2012-08-04 16:10:37 +02:00
parent 2f22fae119 c5cfe22511
commit fb4ee17b05
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/commands.c
View File

@ -1028,9 +1028,14 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
TAILQ_FOREACH(current, &owindows, owindows) {
Output *current_output = get_output_containing(current->con->rect.x,
current->con->rect.y);
if (!current_output) {
ELOG("Cannot get current output. This is a bug in i3.\n");
ysuccess(false);
return;
}
Output *output = get_output_from_string(current_output, name);
if (!output) {
LOG("No such output\n");
ELOG("Could not get output from string \"%s\"\n", name);
ysuccess(false);
return;
}