Commit 3cede8c2 authored by Claes Sjofors's avatar Claes Sjofors

Fast curve open misbehaviour when not initialized fix

parent 19f7370f
...@@ -73,4 +73,5 @@ filecorrupt <File is corrupt> /error ...@@ -73,4 +73,5 @@ filecorrupt <File is corrupt> /error
notcollectw <Not collect window> /error notcollectw <Not collect window> /error
noclassgraph <No classgraph found> /error noclassgraph <No classgraph found> /error
notauthorized <Not authorized for this operation> /error notauthorized <Not authorized for this operation> /error
novalidcurve <No valid curve found> /error
...@@ -75,6 +75,9 @@ XttFastGtk::XttFastGtk( void *parent_ctx, ...@@ -75,6 +75,9 @@ XttFastGtk::XttFastGtk( void *parent_ctx,
{ {
char title[250]; char title[250];
if ( EVEN(*sts))
return;
*sts = XNAV__SUCCESS; *sts = XNAV__SUCCESS;
if ( strcmp( name, "") != 0) if ( strcmp( name, "") != 0)
......
...@@ -140,6 +140,13 @@ XttFast::XttFast( void *parent_ctx, ...@@ -140,6 +140,13 @@ XttFast::XttFast( void *parent_ctx,
} }
} }
if ( !fast_cnt) {
*sts = XNAV__NOVALIDCURVE;
free(gcd);
gcd = 0;
return;
}
// Subscribe to object // Subscribe to object
strcpy( attr_name, fast_name); strcpy( attr_name, fast_name);
strcat( attr_name, ".New"); strcat( attr_name, ".New");
......
...@@ -2885,6 +2885,8 @@ static int xnav_open_func( void *client_data, ...@@ -2885,6 +2885,8 @@ static int xnav_open_func( void *client_data,
pwr_tAName pinstance_str; pwr_tAName pinstance_str;
void *basewidget = 0; void *basewidget = 0;
// Command is "OPEN GRAPH"
parent = ODD( dcli_get_qualifier( "/PARENT", 0, 0)); parent = ODD( dcli_get_qualifier( "/PARENT", 0, 0));
if ( ODD( dcli_get_qualifier( "/FULLSCREEN", 0, 0))) if ( ODD( dcli_get_qualifier( "/FULLSCREEN", 0, 0)))
...@@ -3217,6 +3219,8 @@ static int xnav_open_func( void *client_data, ...@@ -3217,6 +3219,8 @@ static int xnav_open_func( void *client_data,
pwr_tStatus sts; pwr_tStatus sts;
pwr_tAttrRef aref_vect[2]; pwr_tAttrRef aref_vect[2];
// Command is "OPEN MULTIVIEW"
/* Get the name qualifier */ /* Get the name qualifier */
if ( ODD( dcli_get_qualifier( "dcli_arg2", name_str, sizeof(name_str)))) { if ( ODD( dcli_get_qualifier( "dcli_arg2", name_str, sizeof(name_str)))) {
if ( name_str[0] != '/') if ( name_str[0] != '/')
......
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