diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-22 10:05:54 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-22 10:05:54 +0100 |
| commit | 0a88377086329786c438d4973365fdb21186f4e4 (patch) | |
| tree | df5b091b400df84974f58bbfbb78ee26ccb9a5f6 /window-copy.c | |
| parent | b25dc423b0b1369aaec5dee8e051d541bd55043f (diff) | |
| parent | 3909aff06aa6de748ae057cab1e723eec2387edd (diff) | |
| download | rtmux-0a88377086329786c438d4973365fdb21186f4e4.tar.gz rtmux-0a88377086329786c438d4973365fdb21186f4e4.tar.bz2 rtmux-0a88377086329786c438d4973365fdb21186f4e4.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/window-copy.c b/window-copy.c index afa609ed..eb00131e 100644 --- a/window-copy.c +++ b/window-copy.c @@ -2216,14 +2216,12 @@ window_copy_rectangle_toggle(struct window_pane *wp) void window_copy_start_drag(struct client *c, unused struct mouse_event *m) { - struct window_pane *wp; - struct window_copy_mode_data *data; - u_int x, y; + struct window_pane *wp; + u_int x, y; wp = cmd_mouse_pane(m, NULL, NULL); - if (wp->mode != &window_copy_mode) + if (wp == NULL || wp->mode != &window_copy_mode) return; - data = wp->modedata; if (cmd_mouse_at(wp, m, &x, &y, 1) != 0) return; @@ -2244,7 +2242,7 @@ window_copy_drag_update(unused struct client *c, struct mouse_event *m) u_int x, y, old_cy; wp = cmd_mouse_pane(m, NULL, NULL); - if (wp->mode != &window_copy_mode) + if (wp == NULL || wp->mode != &window_copy_mode) return; data = wp->modedata; @@ -2260,13 +2258,11 @@ window_copy_drag_update(unused struct client *c, struct mouse_event *m) void window_copy_drag_release(unused struct client *c, struct mouse_event *m) { - struct window_pane *wp; - struct window_copy_mode_data *data; + struct window_pane *wp; wp = cmd_mouse_pane(m, NULL, NULL); - if (wp->mode != &window_copy_mode) + if (wp == NULL || wp->mode != &window_copy_mode) return; - data = wp->modedata; window_copy_copy_selection(wp, NULL); window_pane_reset_mode(wp); |