jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 16:24:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #704 from ctrlaltca/fix_683

Browse source 
Fix #683 and #684
This commit is contained in:
Zach 2015-02-07 19:15:44 -05:00
commit 25747a0964
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/tab_game.cpp
View file

@ -246,7 +246,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
activeCard(0),
gameClosed(false),
replay(_replay),
currentReplayStep(0)
currentReplayStep(0),
sayEdit(0)
{
setAttribute(Qt::WA_DeleteOnClose);
@ -885,7 +886,8 @@ void TabGame::startGame(bool resuming)
gameInfo.set_started(true);
static_cast<GameScene *>(gameView->scene())->rearrange();
gameView->show();
sayEdit->setFocus();
if(sayEdit)
sayEdit->setFocus();
}
void TabGame::stopGame()