svn merge -r 30913:30953 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / creator / creator.c
index 415f1064dbb6a040e968158af615c6940b0eaacb..d01e5494956e21e6c4cf6000352398229d17da69 100644 (file)
@@ -1140,8 +1140,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);
        }