diff options
| author | Juan Linietsky <red@kyoko> | 2015-05-21 15:02:49 -0300 |
|---|---|---|
| committer | Juan Linietsky <red@kyoko> | 2015-05-21 15:02:49 -0300 |
| commit | bb5d46bb113bca3204db7678eb69900f159e8087 (patch) | |
| tree | cd34e10d67a196d217559ab8d4973b8f5bc4ccde /platform/windows/godot_win.cpp | |
| parent | 4b8745ad63409cf14b02735981ee35d2f794421c (diff) | |
| parent | 6049479a99f66b620d59498a76ed9f2c3891f4c8 (diff) | |
| download | redot-engine-bb5d46bb113bca3204db7678eb69900f159e8087.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/windows/godot_win.cpp')
| -rw-r--r-- | platform/windows/godot_win.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/platform/windows/godot_win.cpp b/platform/windows/godot_win.cpp index 81c90d9dd0..fe39051670 100644 --- a/platform/windows/godot_win.cpp +++ b/platform/windows/godot_win.cpp @@ -135,7 +135,12 @@ int widechar_main(int argc, wchar_t** argv) { argv_utf8[i] = wc_to_utf8(argv[i]); } - Main::setup(argv_utf8[0], argc - 1, &argv_utf8[1]); + Error err = Main::setup(argv_utf8[0], argc - 1, &argv_utf8[1]); + + if (err!=OK) + return 255; + + if (Main::start()) os.run(); Main::cleanup(); |