diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-07-05 14:27:40 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:52:31 -0700 |
| commit | bd8083d7e2be0421d99ba2ba24d7fb7221988a30 (patch) | |
| tree | 0edef02c8a80352de229ce27372f02ac8b81dcc9 /sesman | |
| parent | 45b0bc9f17f0788bdfe28c0ae687faa0bce9374f (diff) | |
| download | xrdp-proprietary-bd8083d7e2be0421d99ba2ba24d7fb7221988a30.tar.gz xrdp-proprietary-bd8083d7e2be0421d99ba2ba24d7fb7221988a30.zip | |
Fix merge errors introduced in 3ae1b415 and 20ec9ee3
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/chansrv/rail.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c index 23399a18..c2137fb7 100644 --- a/sesman/chansrv/rail.c +++ b/sesman/chansrv/rail.c @@ -1135,6 +1135,8 @@ rail_win_send_text(Window win) static int APP_CC rail_destroy_window(Window window_id) { + struct stream *s; + LOG(10, ("chansrv::rail_destroy_window 0x%8.8x", window_id)); make_stream(s); init_stream(s, 1024); @@ -1672,7 +1674,7 @@ rail_xevent(void *xevent) rail_destroy_window(lxevent->xdestroywindow.window); list_remove_item(g_window_list, index); } - v = 0; + rv = 0; break; case MapRequest: |