Commit 9bfa2661 authored by Claes Sjofors's avatar Claes Sjofors

Eventlist was not loaded with xtt command 'open operatorwindow'

parent 68bc06c3
...@@ -229,7 +229,7 @@ void Xtt::close_ok( void *ctx, void *data) ...@@ -229,7 +229,7 @@ void Xtt::close_ok( void *ctx, void *data)
{ {
Xtt *xtt = (Xtt *) ctx; Xtt *xtt = (Xtt *) ctx;
delete xtt->xnav; delete xtt;
exit(0); exit(0);
} }
...@@ -589,6 +589,8 @@ void Xtt::list_opplace() ...@@ -589,6 +589,8 @@ void Xtt::list_opplace()
pwr_tCmd cmd; pwr_tCmd cmd;
sprintf( cmd, "open operator %s", texts[0]); sprintf( cmd, "open operator %s", texts[0]);
if ( op_close_button)
strcat( cmd, " /closebutton");
xnav->command( cmd); xnav->command( cmd);
} }
else else
......
...@@ -2728,6 +2728,15 @@ static int xnav_open_func( void *client_data, ...@@ -2728,6 +2728,15 @@ static int xnav_open_func( void *client_data,
xnav->op->ack_last_cb = xnav_op_ack_last_cb; xnav->op->ack_last_cb = xnav_op_ack_last_cb;
if ( closebutton) if ( closebutton)
xnav->op->add_close_button(); xnav->op->add_close_button();
strcpy( xnav->opplace_name, opplace_str);
// Load eventlist
if ( xnav->ev) {
delete ((XNav *)xnav)->ev;
((XNav *)xnav)->ev = NULL;
}
xnav->load_ev_from_opplace();
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment