summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Joannon <hello@pauljoannon.com>2018-01-15 01:04:33 +0100
committerPaul Joannon <hello@pauljoannon.com>2018-01-15 12:52:54 +0100
commit3f8a4cc7193e964f716fde2cd28a946669e2d8d6 (patch)
treea186fee540d80adbeb9d6a25cb063c7f0211ed3e
parent69452fbc3754ed517280a674aa61b36de31cac7f (diff)
Fix bug when launching a game with no main scene
Check for a main scene after loading project settings and exit if there's none (except if launching in editor mode).
-rw-r--r--main/main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 0b231b9d30..87a0e953b0 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -744,6 +744,15 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
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
}
GLOBAL_DEF("logging/file_logging/enable_file_logging", false);