Commit f606b2ce authored by Claes Sjofors's avatar Claes Sjofors

Xtt method OpenGraph didn't work on attrbute objects

parent ee39a51e
...@@ -836,8 +836,6 @@ static pwr_tStatus OpenGraph( xmenu_sMenuCall *ip) ...@@ -836,8 +836,6 @@ static pwr_tStatus OpenGraph( xmenu_sMenuCall *ip)
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
if ( classid == pwr_cClass_XttGraph) { if ( classid == pwr_cClass_XttGraph) {
printf( "DefGraph found\n");
sts = gdh_AttrrefToName( &defgraph, name, sizeof(name), cdh_mNName); sts = gdh_AttrrefToName( &defgraph, name, sizeof(name), cdh_mNName);
strcpy( cmd, "ope gra/obj="); strcpy( cmd, "ope gra/obj=");
strcat( cmd, name); strcat( cmd, name);
...@@ -846,11 +844,12 @@ static pwr_tStatus OpenGraph( xmenu_sMenuCall *ip) ...@@ -846,11 +844,12 @@ static pwr_tStatus OpenGraph( xmenu_sMenuCall *ip)
} }
} }
if ( !objar->Flags.b.Object) if ( aref.Flags.b.Object) {
break; sts = gdh_GetParent( aref.Objid, &objid);
aref = cdh_ObjidToAref( objid);
sts = gdh_GetParent( aref.Objid, &objid); }
aref = cdh_ObjidToAref( objid); else
sts = gdh_AttrArefToObjectAref( &aref, &aref);
} }
return XNAV__SUCCESS; return XNAV__SUCCESS;
...@@ -914,11 +913,13 @@ static pwr_tStatus OpenGraphFilter( xmenu_sMenuCall *ip) ...@@ -914,11 +913,13 @@ static pwr_tStatus OpenGraphFilter( xmenu_sMenuCall *ip)
return XNAV__SUCCESS; return XNAV__SUCCESS;
} }
} }
if ( !objar->Flags.b.Object)
break;
sts = gdh_GetParent( aref.Objid, &objid); if ( aref.Flags.b.Object) {
aref = cdh_ObjidToAref( objid); sts = gdh_GetParent( aref.Objid, &objid);
aref = cdh_ObjidToAref( objid);
}
else
sts = gdh_AttrArefToObjectAref( &aref, &aref);
} }
return XNAV__INVISIBLE; return XNAV__INVISIBLE;
......
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