Merge branch 'alpha401/dediserverfixes' of https://github.com/Azaezel/Torque3D-1 into alpha401/dediserverfixes

This commit is contained in:
AzaezelX 2022-10-01 01:41:41 -05:00
commit 02aee76fc9

View file

@ -44,7 +44,7 @@ if(isFunction("loadStartup"))
else
{
//If nothing else set a main menu, try to do so now
if(isObject(Canvas) || !isObject(Canvas.getContent()))
if(isObject(Canvas) && !isObject(Canvas.getContent()))
{
if (isObject( ProjectSettings.value("UI/mainMenuName") ))
Canvas.setContent( ProjectSettings.value("UI/mainMenuName") );
@ -54,4 +54,4 @@ else
if ( ($Server::Dedicated == false) && ($platform $= "windows") )
closeSplashWindow();
echo("Engine initialized...");
echo("Engine initialized...");