summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameController.cpp2
-rw-r--r--src/game/GameView.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 3408ec5..7b7ba20 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -97,6 +97,8 @@ public:
{
cc->gameModel->SetStamp(cc->stamps->GetStamp());
}
+ else
+ cc->gameModel->SetStamp(NULL);
}
};
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index c7dc063..4067d5a 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -717,6 +717,10 @@ void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bo
void GameView::OnTick(float dt)
{
+ if(selectMode==PlaceStamp && !stampThumb)
+ selectMode = SelectNone;
+ if(selectMode==PlaceClipboard&& !clipboardThumb)
+ selectMode = SelectNone;
if(zoomEnabled && !zoomCursorFixed)
c->SetZoomPosition(currentMouse);
if(drawMode == DrawPoints)