svn merge -r 30954:31059 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / creator / creator.c
index 05359b0611210bddabd0f723322aa1cdadfaf009..e99935f64a38abd8b8ae2d0f1241acab4bb1d12e 100644 (file)
@@ -1144,8 +1144,10 @@ int main(int argc, char **argv)
 
        else {
                if((G.fileflags & G_FILE_AUTOPLAY) && (G.f & G_SCRIPT_AUTOEXEC))
-                       WM_init_game(C);
-
+               {
+                       if(WM_init_game(C))
+                               return 0;
+               }
                else if(!G.file_loaded)
                        WM_init_splash(C);
        }