mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge branch 'alpha401/dediserverfixes' of https://github.com/Azaezel/Torque3D-1 into alpha401/dediserverfixes
This commit is contained in:
commit
02aee76fc9
|
|
@ -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...");
|
||||
|
|
|
|||
Loading…
Reference in a new issue