1 files changed, 6 insertions, 2 deletions

diff --git a/src/bin/client/repl.rs b/src/bin/client/repl.rs
index 91fd10e..dfcf0d2 100644
--- a/src/bin/client/repl.rs
+++ b/src/bin/client/repl.rs
@@ -6,6 +6,7 @@ use std::time::Instant;
 use crate::connection::TlsStream;
 use crate::database;
 use crate::games::manager::GameManager;
+use crate::games::traits::GamePhase;
 
 use crossterm::{
     cursor::{Hide, MoveToColumn, Show},
@@ -77,12 +78,15 @@ impl ClientState {
                 return true;
             }
             KeyCode::Char(' ') => {
-                let should_start = !self.game_manager.is_game_started();
-                if should_start {
+                let can_spin = self.game_manager.get_current_state()
+                    .map(|s| s.phase == GamePhase::WaitingToStart || s.phase == GamePhase::Finished)
+                    .unwrap_or(false);
+                if can_spin {
                     if let Some(mut stream) = self.stream.take() {
                         match self.game_manager.start_game(&mut stream) {
                             Ok(()) => {
                                 self.play_spin_animation(&mut stream);
+                                self.game_manager.reset_phase_to_waiting();
                             }
                             Err(e) => println!("\nError starting game: {:?}", e),
                         }