From 9bfa266117640341a2e83b388aeec55ff994c587 Mon Sep 17 00:00:00 2001
From: Claes Sjofors <claes.sjofors@proview.se>
Date: Wed, 27 May 2009 17:43:49 +0200
Subject: [PATCH] Eventlist was not loaded with xtt command 'open
operatorwindow'
---
xtt/exe/rt_xtt/src/xtt_main.cpp | 4 +++-
xtt/lib/xtt/src/xtt_xnav_command.cpp | 9 +++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/xtt/exe/rt_xtt/src/xtt_main.cpp b/xtt/exe/rt_xtt/src/xtt_main.cpp
index fba9a3b91..442a0579f 100644
--- a/xtt/exe/rt_xtt/src/xtt_main.cpp
+++ b/xtt/exe/rt_xtt/src/xtt_main.cpp
@@ -229,7 +229,7 @@ void Xtt::close_ok( void *ctx, void *data)
{
Xtt *xtt = (Xtt *) ctx;
- delete xtt->xnav;
+ delete xtt;
exit(0);
}
@@ -589,6 +589,8 @@ void Xtt::list_opplace()
pwr_tCmd cmd;
sprintf( cmd, "open operator %s", texts[0]);
+ if ( op_close_button)
+ strcat( cmd, " /closebutton");
xnav->command( cmd);
}
else
diff --git a/xtt/lib/xtt/src/xtt_xnav_command.cpp b/xtt/lib/xtt/src/xtt_xnav_command.cpp
index 5498b17fc..486651ce1 100644
--- a/xtt/lib/xtt/src/xtt_xnav_command.cpp
+++ b/xtt/lib/xtt/src/xtt_xnav_command.cpp
@@ -2728,6 +2728,15 @@ static int xnav_open_func( void *client_data,
xnav->op->ack_last_cb = xnav_op_ack_last_cb;
if ( closebutton)
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
{
--
2.30.9