diff options
author | Thomas Adam <thomas@xteddy.org> | 2019-03-18 18:02:38 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2019-03-18 18:02:38 +0000 |
commit | 1d6fe43c7b2250f042d0113da8545d5ebb75c01e (patch) | |
tree | f7e5acf8066269b8aba85ec22e76117ab863fbfb /grid.c | |
parent | 4cbf596dc5828274b92d783aaa1da996fa481ca8 (diff) | |
parent | d738d5168804405240a3f36b6f410baee39cd9e0 (diff) | |
download | rtmux-1d6fe43c7b2250f042d0113da8545d5ebb75c01e.tar.gz rtmux-1d6fe43c7b2250f042d0113da8545d5ebb75c01e.tar.bz2 rtmux-1d6fe43c7b2250f042d0113da8545d5ebb75c01e.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'grid.c')
-rw-r--r-- | grid.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -481,11 +481,10 @@ void grid_get_cell(struct grid *gd, u_int px, u_int py, struct grid_cell *gc) { if (grid_check_y(gd, __func__, py) != 0 || - px >= gd->linedata[py].cellsize) { + px >= gd->linedata[py].cellsize) memcpy(gc, &grid_default_cell, sizeof *gc); - return; - } - return (grid_get_cell1(&gd->linedata[py], px, gc)); + else + grid_get_cell1(&gd->linedata[py], px, gc); } /* Set cell at relative position. */ |