mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crashes in rail mode after merge of floatbar fixes.

Browse Source
This commit is contained in:
Armin Novak 2018-12-10 15:41:20 +01:00
parent b82c4f779a
commit 2ce04069cb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/X11/xf_client.c
View File

@ -1549,7 +1549,9 @@ static DWORD WINAPI xf_client_thread(LPVOID param)
nCount += tmp;
}
xf_floatbar_hide_and_show(xfc->window->floatbar);
if (xfc->window)
xf_floatbar_hide_and_show(xfc->window->floatbar);
waitStatus = WaitForMultipleObjects(nCount, handles, FALSE, INFINITE);
if (waitStatus == WAIT_FAILED)

13
client/X11/xf_event.c
View File

@ -367,7 +367,9 @@ static BOOL xf_event_MotionNotify(xfContext* xfc, XEvent* event, BOOL app)
if (xfc->use_xinput)
return TRUE;
xf_floatbar_set_root_y(xfc->window->floatbar, event->xmotion.y);
if (xfc->window)
xf_floatbar_set_root_y(xfc->window->floatbar, event->xmotion.y);
return xf_generic_MotionNotify(xfc, event->xmotion.x, event->xmotion.y,
event->xmotion.state, event->xmotion.window, app);
}
@ -1016,10 +1018,13 @@ BOOL xf_event_process(freerdp* instance, XEvent* event)
}
}
if (xf_floatbar_check_event(xfc->window->floatbar, event))
if (xfc->window)
{
xf_floatbar_event_process(xfc->window->floatbar, event);
return TRUE;
if (xf_floatbar_check_event(xfc->window->floatbar, event))
{
xf_floatbar_event_process(xfc->window->floatbar, event);
return TRUE;
}
}
xf_event_execute_action_script(xfc, event);