summaryrefslogtreecommitdiffstats
path: root/demos/declarative/minehunt/minehunt.cpp
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-15 11:39:24 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-10-15 11:39:24 (GMT)
commite7b372e4705451dfd4443db7e6fc64d4b8f30c68 (patch)
tree0d727db87776fa5ae29c6e3a024c0cc7168baf4b /demos/declarative/minehunt/minehunt.cpp
parent71745cab0d112edf3755f1883b3f9b34c0f251c9 (diff)
parent0a299be472da5829e17b886450dd134302b861a0 (diff)
downloadQt-e7b372e4705451dfd4443db7e6fc64d4b8f30c68.zip
Qt-e7b372e4705451dfd4443db7e6fc64d4b8f30c68.tar.gz
Qt-e7b372e4705451dfd4443db7e6fc64d4b8f30c68.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'demos/declarative/minehunt/minehunt.cpp')
-rw-r--r--demos/declarative/minehunt/minehunt.cpp4
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());