Index: game.c
==================================================================
--- game.c
+++ game.c
@@ -792,10 +792,11 @@
 
 void run_game(void) {
   int i;
   SDL_Event ev;
   set_caption();
+  replay_count=0;
   if(side_mode==255) setup_game();
   begin_level(level_id);
   redraw_game();
   timerflag=0;
   SDL_SetTimer(10,timer_callback);
@@ -836,10 +837,11 @@
       command:
         if(i==-1) goto quit;
         if(i==-2) {
           main_options['e']=1;
           SDL_SetTimer(0,0);
+          save_replay();
           return;
         }
       replay:
         if(inputs_count) {
           for(i=0;i<inputs_count && !gameover;i++) if(inputs[i]) input_move(inputs[i]);
@@ -850,10 +852,11 @@
         timerflag=0; // ensure we have not missed a timer event
         break;
     }
   }
   quit:
+  SDL_SetTimer(0,0);
   save_replay();
   exit(0);
 }
 
 void run_auto_test(void) {