godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15741 from paulloz/bug-no-main-scene

Browse Source 
Fix bug when launching a game with no main scene
This commit is contained in:
Rémi Verschelde 2018-02-14 16:25:18 +01:00 committed by GitHub
commit 583d6f2682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/main.cpp
View File

@ -747,6 +747,15 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->print("Error: Could not load game path '%s'.\n", game_path.ascii().get_data()); OS::get_singleton()->print("Error: Could not load game path '%s'.\n", game_path.ascii().get_data());
goto error; goto error;
#endif
} else if (String(GLOBAL_DEF("application/run/main_scene", "")) == "") {
#ifdef TOOLS_ENABLED
if (!editor) {
#endif
OS::get_singleton()->print("Error: Can't run project: no main scene defined.\n");
goto error;
#ifdef TOOLS_ENABLED
}
#endif #endif
} }