workspaces: don't segfault on invalid move_surface_to_workspace request

Also fixes the off-by-one in toytoolkit that exposed the issue.
2012-09-01 16:03:05 +02:00
parent 8538b22ff4
commit 067abf67cd
2 changed files with 5 additions and 1 deletions
@@ -1704,7 +1704,7 @@ frame_menu_func(struct window *window, int index, void *data)
 		break;
 	case 3: /* move to workspace below */
 		display = window->display;
-		if (display->workspace < display->workspace_count)
+		if (display->workspace < display->workspace_count - 1)
 			workspace_manager_move_surface(display->workspace_manager,
 						       window->surface,
 						       display->workspace + 1);