diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-14 22:00:12 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-14 22:00:12 (GMT) |
| commit | ca7a96943c122b8371caf98dc92f7e6644de1814 (patch) | |
| tree | 4aaed5a7e0401455090ea0d92dd1ff26d86f09f7 /demos | |
| parent | f103ad276181090da8c70bd29f4474ea7657e03f (diff) | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| download | Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.zip Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.tar.gz Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/minehunt/minehunt.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp index 9c82f30..709d945 100644 --- a/demos/declarative/minehunt/minehunt.cpp +++ b/demos/declarative/minehunt/minehunt.cpp @@ -195,6 +195,7 @@ bool MinehuntGame::flip(int row, int col) won = false; hasWonChanged(); setPlaying(false); + return true; } remaining--; @@ -202,6 +203,7 @@ bool MinehuntGame::flip(int row, int col) won = true; hasWonChanged(); setPlaying(false); + return true; } return true; } @@ -209,7 +211,7 @@ bool MinehuntGame::flip(int row, int col) bool MinehuntGame::flag(int row, int col) { TileData *t = tile(row, col); - if(!t) + if(!t || !playing) return false; t->setHasFlag(!t->hasFlag()); |