Merged changes in the trunk up to revision 31403.
[blender.git] / source / creator / creator.c
index 38480c1ffe0dbb758e9a6458aa20f9c5a84dcefb..048dcd232b503187a0ad88b1d262fb3b5eead4d9 100644 (file)
@@ -1150,8 +1150,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);
        }