diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-20 16:24:06 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-20 16:24:06 +0000 |
| commit | 843cfe68a7dc43f14522f80725627599c949b70d (patch) | |
| tree | 73d8bf633b234f39a525d8646b60e4b172e002c2 /src/game.cpp | |
| parent | b94970f6f79980a9b386cf499da31880006247b0 (diff) | |
| download | mana-843cfe68a7dc43f14522f80725627599c949b70d.tar.gz mana-843cfe68a7dc43f14522f80725627599c949b70d.tar.bz2 mana-843cfe68a7dc43f14522f80725627599c949b70d.tar.xz mana-843cfe68a7dc43f14522f80725627599c949b70d.zip | |
Merged revisions 3962-3983,3985-3999,4001-4021 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r3962 | crush_tmw | 2008-03-09 16:35:00 +0100 (Sun, 09 Mar 2008) | 1 line
Applied some patches by peavey related to chatlog and the quit dialog.
........
r3968 | umperio | 2008-03-11 14:56:47 +0100 (Tue, 11 Mar 2008) | 1 line
Removed unused image.
........
r3969 | b_lindeijer | 2008-03-11 17:44:20 +0100 (Tue, 11 Mar 2008) | 2 lines
Also removed unused image from the files to be installed.
........
r4006 | crush_tmw | 2008-03-26 00:28:05 +0100 (Wed, 26 Mar 2008) | 1 line
Initialized some uninitialized variables (patch by peavey).
........
r4008 | b_lindeijer | 2008-03-27 15:51:10 +0100 (Thu, 27 Mar 2008) | 2 lines
Applied patch by peavey and added his name to the ChangeLog some more.
........
r4010 | b_lindeijer | 2008-03-30 16:06:14 +0200 (Sun, 30 Mar 2008) | 2 lines
Updated configure.ac for tmwdata split (patch by peavey).
........
r4018 | crush_tmw | 2008-04-01 03:02:30 +0200 (Tue, 01 Apr 2008) | 1 line
Added makefile for TMXCopy by jaxad.
........
r4019 | crush_tmw | 2008-04-01 03:34:29 +0200 (Tue, 01 Apr 2008) | 1 line
compilation fixes suggested by peavey.
........
r4020 | crush_tmw | 2008-04-01 03:37:51 +0200 (Tue, 01 Apr 2008) | 1 line
renaming makefile to Makefile
........
r4021 | crush_tmw | 2008-04-01 03:38:35 +0200 (Tue, 01 Apr 2008) | 1 line
renaming makefile to Makefile
........
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index fcbc5aba..039a1916 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -540,10 +540,11 @@ void Game::handleInput() if (!quitDialog) { quitDialog = new QuitDialog(&done, &quitDialog); + quitDialog->requestMoveToTop(); } else { - quitDialog->requestMoveToTop(); + quitDialog->action(gcn::ActionEvent(NULL, "cancel")); } break; |