From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 18 Nov 2020 20:50:34 +0000 (+0000)
Subject: cli: don't auto join games
X-Git-Tag: otter-0.2.0~480
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7f146c71cb30b253d9d3f5b35957bb68450e4c53;p=otter.git

cli: don't auto join games

This reverts commit e212270ec6423f2c11574d70cac0f09ec3873c70.
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 42be7c51..0c947ff7 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -624,13 +624,11 @@ fn access_account(ma: &MainOpts) -> Conn {
 
 #[throws(AE)]
 fn access_game(ma: &MainOpts, table_name: &String) -> ConnForGame {
-  let mut chan = ConnForGame {
+  ConnForGame {
     conn: access_account(ma)?,
     game: ma.instance_name(table_name),
     how: MgmtGameUpdateMode::Online,
-  };
-  chan.join_game(&ma)?;
-  chan
+  }
 }
 
 //---------- reset-game ----------
@@ -733,7 +731,8 @@ mod join_game {
 
   fn call(_sc: &Subcommand, ma: MainOpts, args: Vec<String>) ->Result<(),AE> {
     let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
-    let _chan = access_game(&ma, &args.table_name)?;
+    let mut chan = access_game(&ma, &args.table_name)?;
+    chan.join_game(&ma)?;
     Ok(())
   }