Fix mismatched game ID when loading games from the command line

html-src/rules/aceofhearts.html

@@ -18,5 +18,5 @@ are no moves left, you can deal a card from the talon to each pile.
 <p>
 The single foundation is started with the ace of hearts.  After the
 ace of hearts is played, it is built up by rank, regardless of suit,
-turning the corner from king to ace as neede.  The game is won if
+turning the corner from king to ace as needed.  The game is won if
 all cards are moved to this one foundation.

html-src/rules/doublebisley.html

@@ -9,4 +9,4 @@ Move all cards to the foundations.
 <h3>Quick Description</h3>
 <p>
 Like <a href="bisley.html">Bisley</a>,
-but two decks and twenty four playing piles.
+but two decks and twenty-four playing piles.

html-src/rules/fatimehsgame.html

@@ -12,7 +12,7 @@ with twelve rows and two redeals.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When
 the talon is empty after each round the cards are gathered up from the

html-src/rules/fatimehsgamerelaxed.html

@@ -13,7 +13,7 @@ which will hold two cards.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When
 the talon is empty after each round the cards are gathered up from the

html-src/rules/freecell2reserves.html

@@ -1,6 +1,6 @@
 <h1>FreeCell (2 Reserves)</h1>
 <p>
-FreeCell type. 1 decks. No redeal.
+FreeCell type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>

html-src/rules/freecellnoreserve.html

@@ -1,6 +1,6 @@
 <h1>FreeCell (No Reserve)</h1>
 <p>
-FreeCell type. 1 decks. No redeal.
+FreeCell type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>

html-src/rules/gaji.html

@@ -16,7 +16,7 @@ on Iris 2, and Pine 3 plays on Phoenix 3.  Gaji is wild.  It can play
 on any card in the tableau and any card can play on Gaji.  Any card
 can also be played on the canvas.    Gaji will only play in its proper
 position on the foundation.  Cards play on the tableau by suit in
-decending rank order.  There can be no more than twelve cards in a row.
+descending rank order.  There can be no more than twelve cards in a row.
 Once a card is played on a foundation stack it can't be taken off
 except by undoing the move.
 

html-src/rules/hexaklon.html

@@ -19,7 +19,7 @@ that row may become unmovable.  The Wizards have ranks like the suit cards
 corresponding to Ace through Four.  If a Wizard is played in it's proper rank
 position the row can still be moved.  The rank can be determined by the height
 of the hat.  The Ace Wizard has the tallest hat.  A stack with two Wizards can
-be moved only if they are both in their rank position and they are not ajacent
+be moved only if they are both in their rank position and they are not adjacent
 to each other.  The Wizards will not move off of the tableau until all the other
 cards have been moved to the foundations.
 

html-src/rules/interregnum.html

@@ -24,7 +24,7 @@ added to each of the playing piles.
 <p>
 <i>Autodrop</i> is disabled for this game.
 
-<h3>Histoy</h3>
+<h3>History</h3>
 <p>
 This is a two-deck variation of
 <a href="auldlangsyne.html">Auld Lang Syne</a>.

html-src/rules/kalisgame.html

@@ -12,7 +12,7 @@ with twelve rows and two redeals.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Only one 120 card Dashavatara deck is used.  Otherwise the
+talon.  Only one 120 card Dashavatara deck is used.  Otherwise, the
 dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When

html-src/rules/kalisgamedoubled.html

@@ -12,7 +12,7 @@ with twelve rows, three redeals and a reserve stack.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Only one 120 card Dashavatara deck is used.  Otherwise the
+talon.  Only one 120 card Dashavatara deck is used.  Otherwise, the
 dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are three redeals.  When

html-src/rules/kalisgamerelaxed.html

@@ -13,7 +13,7 @@ which will hold two cards.
 Refer to the description of the deal in Lara's Game.  The differences
 are that the cards are dealt to thirteen piles instead of fourteen
 and if a dealt card is of rank Pradhan or over one card is dealt to the
-talon.  Only one 120 card Dashavatara deck is used.  Otherwise the
+talon.  Only one 120 card Dashavatara deck is used.  Otherwise, the
 dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there are two redeals.  When

html-src/rules/katrinasgame.html

@@ -10,9 +10,9 @@ with twenty two rows and one redeal, using the Tarock deck.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are that the cards are dealt to twenty three piles instead of fourteen
+are that the cards are dealt to twenty-three piles instead of fourteen
 and if a dealt card is of rank Page or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game except that there is one redeal.  When
 the talon is empty after the first round the cards are gathered up from

html-src/rules/katrinasgamedoubled.html

@@ -12,9 +12,9 @@ using four decks.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are that the cards are dealt to twenty three piles instead of fourteen
+are that the cards are dealt to twenty-three piles instead of fourteen
 and if a dealt card is of rank Page or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game with two exceptions.  The first exception
 is that there are two redeals.  When the talon is empty after the one

html-src/rules/katrinasgamerelaxed.html

@@ -12,9 +12,9 @@ with a reserve stack.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are that the cards are dealt to twenty three piles instead of fourteen
+are that the cards are dealt to twenty-three piles instead of fourteen
 and if a dealt card is of rank Page or over one card is dealt to the
-talon.  Otherwise the dealing rules are the same.
+talon.  Otherwise, the dealing rules are the same.
 <p>
 Play is the same as Lara's Game with two exceptions.  The first exception
 is that there is one redeal.  When the talon is empty after the first

html-src/rules/kingdom.html

@@ -8,7 +8,7 @@ Move all cards to the foundations.
 
 <h3>Rules</h3>
 <p>
-The foundations build up by rank igonoring suit.
+The foundations build up by rank ignoring suit.
 <p>
 The reserve piles can hold a single card and
 are automatically filled from the waste or talon.

html-src/rules/larasgamedoubled.html

@@ -10,8 +10,8 @@ with four decks, two redeals and a reserve stack.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are the use of four decks instead of two two redeals and a reserve stack.
-Otherwise the play and dealing rules are the same.
+are the use of four decks instead of two, two redeals, and a reserve stack.
+Otherwise, the play and dealing rules are the same.
 <p>
 When the talon is empty after each round the cards are gathered up from
 the tableau and dealt to the rows without being shuffled using the same

html-src/rules/larasgamerelaxed.html

@@ -10,8 +10,8 @@ with a redeal and a reserve stack.
 
 <h3>Rules</h3>
 Refer to the description of the deal in Lara's Game.  The differences
-are the use of four decks instead of two two redeals and a reserve stack.
-Otherwise the play and dealing rules are the same.
+are the use of a redeals, and a reserve stack.  Otherwise, the play and
+dealing rules are the same.
 <p>
 When the talon is empty after each round the cards are gathered up from
 the tableau and dealt to the rows without being shuffled using the same

html-src/rules/saratoga.html

@@ -1,6 +1,6 @@
 <h1>Saratoga</h1>
 <p>
-Klondike type. 1 deck. Unlimited redeal.
+Klondike type. 1 deck. Unlimited redeals.
 
 <h3>Object</h3>
 <p>

html-src/rules/tabbycat.html

@@ -12,7 +12,7 @@ Foundations are built up from Ace to King, regardless of suit. One
 must move an entire Ace-to-King sequence to a foundation as one move.
 <p>
 The playing piles build down by rank, regardless of suit. A king may
-be played on an ace.. An empty pile can receive any card, or
+be played on an ace. An empty pile can receive any card, or
 sequence.
 <p>
 When no more moves are possible, click on the talon. One card will be

html-src/rules/thirty.html

@@ -18,5 +18,5 @@ of the same suit can be moved together.  The reserve cards can be
 moved to appropriate tableau or foundation piles at any time.
 <p>
 The foundations are built up by same suit, starting with the ace.
-Then, the seven is played on the ace and it is built up to king.
+Then, the seven is played on the ace, which is then built up to king.
 The game is won if all cards are moved to the foundations.

html-src/rules/thirtytwocards.html

@@ -9,7 +9,7 @@ Move all the cards to the foundations.
 <h3>Quick Description</h3>
 <p>
 Like <a href="vague.html">Vague</a>,
-but with two decks, and thirty two tableau cards (as
+but with two decks, and thirty-two tableau cards (as
 the game's name suggests).  Additionally, one set of
 foundations is built down from king to ace while the
 other is built up from ace to king.

pysollib/app.py

@@ -338,6 +338,7 @@ class Application:
                     self.nextgame.loadedgame = tmpgame._loadGame(
                         self.commandline.loadgame, self)
                     self.nextgame.loadedgame.gstats.holded = 0
+                    self.nextgame.id = self.nextgame.loadedgame.id
                 except Exception:
                     traceback.print_exc()
                     self.nextgame.loadedgame = None