jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge errors introduced in 3ae1b415 and 20ec9ee3

Browse Source
This commit is contained in:
Jim Grandy 2013-07-05 14:27:40 -07:00
parent cb1efca637
commit 4bfe0c167a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sesman/chansrv/rail.c
View File

@ -1135,6 +1135,8 @@ rail_win_send_text(Window win)
static int APP_CC static int APP_CC
rail_destroy_window(Window window_id) rail_destroy_window(Window window_id)
{ {
struct stream *s;
LOG(10, ("chansrv::rail_destroy_window 0x%8.8x", window_id)); LOG(10, ("chansrv::rail_destroy_window 0x%8.8x", window_id));
make_stream(s); make_stream(s);
init_stream(s, 1024); init_stream(s, 1024);
@ -1672,7 +1674,7 @@ rail_xevent(void *xevent)
rail_destroy_window(lxevent->xdestroywindow.window); rail_destroy_window(lxevent->xdestroywindow.window);
list_remove_item(g_window_list, index); list_remove_item(g_window_list, index);
} }
v = 0; rv = 0;
break; break;
case MapRequest: case MapRequest: