X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalSys.cxx;h=aee1dc54d94e4b556f81d4c14fead7fa8a2d0be8;hb=12076bce0e9fb66286f14931e8f4eb12fc0b9b82;hp=44053f27915334a60b1250420e181198956631b2;hpb=863cd6a2902b97c3328a6bd4cd41b9182b78aadd;p=flightgear.git diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx index 44053f279..aee1dc54d 100644 --- a/src/Scripting/NasalSys.cxx +++ b/src/Scripting/NasalSys.cxx @@ -558,17 +558,13 @@ void FGNasalSys::init() initNasalPositioned(_globals, _context, _gcHash); NasalClipboard::init(this); + initNasalCanvas(_globals, _context, _gcHash); initNasalCondition(_globals, _context, _gcHash); // Now load the various source files in the Nasal directory simgear::Dir nasalDir(SGPath(globals->get_fg_root(), "Nasal")); loadScriptDirectory(nasalDir); - // NasalCanvas needs to be initialized after the props module from props.nas - // (located in $FG_ROOT/Nasal/) has been loaded but before loading the - // canvas module or any script creating a canvas. - initNasalCanvas(_globals, _context, _gcHash); - // Add modules in Nasal subdirectories to property tree simgear::PathList directories = nasalDir.children(simgear::Dir::TYPE_DIR+ simgear::Dir::NO_DOT_OR_DOTDOT, "");