aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Page2008-06-16 18:47:32 +0000
committerChristopher Page2008-06-16 18:47:32 +0000
commit7009aae8930835221677e71f085841abf66c0151 (patch)
tree5f63082a1739361d728fdcbb22f57ec2439d9eaf
parent23fc803dad8d1e223c1a43fab076056e62fe201b (diff)
downloadscummvm-rg350-7009aae8930835221677e71f085841abf66c0151.tar.gz
scummvm-rg350-7009aae8930835221677e71f085841abf66c0151.tar.bz2
scummvm-rg350-7009aae8930835221677e71f085841abf66c0151.zip
Fixed a problem where the function that I previously implemented, popAllCursors(), was causing the mouse cursor to disapear
svn-id: r32719
-rw-r--r--gui/launcher.cpp3
-rw-r--r--gui/newgui.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 2c1212b84a..4475df5720 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -44,6 +44,7 @@
#include "gui/ListWidget.h"
#include "gui/TabWidget.h"
#include "gui/PopUpWidget.h"
+#include "graphics/cursorman.h"
#include "sound/mididrv.h"
@@ -549,6 +550,8 @@ void LauncherDialog::open() {
// failure to launch a game. Otherwise, pressing ESC will attempt to
// re-launch the same game again.
ConfMan.setActiveDomain("");
+
+ CursorMan.popAllCursors();
Dialog::open();
updateButtons();
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index ddb69853f1..618c7bc873 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -365,8 +365,6 @@ void NewGui::openDialog(Dialog *dialog) {
_dialogStack.push(dialog);
_needRedraw = true;
- CursorMan.popAllCursors();
-
// We reflow the dialog just before opening it. If the screen changed
// since the last time we looked, also refresh the loaded theme,
// and reflow all other open dialogs, too.