TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
AzaezelX 2022-10-01 01:41:41 -05:00
commit 02aee76fc9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/main.tscript.in
View file

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