merge r6004 from trunk
This commit is contained in:
parent
75c63eece5
commit
53975abf12
1 changed files with 2 additions and 1 deletions
|
@ -329,7 +329,8 @@ void keyboard_shutdown(gboolean reconfig)
|
||||||
if (!reconfig)
|
if (!reconfig)
|
||||||
client_remove_destructor(keyboard_interactive_end_client);
|
client_remove_destructor(keyboard_interactive_end_client);
|
||||||
|
|
||||||
keyboard_interactive_end(0, TRUE, 0, TRUE);
|
if (istate.active)
|
||||||
|
keyboard_interactive_end(0, TRUE, 0, TRUE);
|
||||||
|
|
||||||
ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
|
ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue