diff options
| author | Johannes Schickel | 2012-08-12 14:49:28 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-08-12 14:49:28 +0200 |
| commit | 4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24 (patch) | |
| tree | efa33c489905333cd56c8988c3a03e27f47f1fcf /gui/gui-manager.cpp | |
| parent | 61af435d8a870a0630b5dea2ecf69cd58fc95946 (diff) | |
| parent | 71daae7bbc03c1d9327f5353b1450f9d0d9774da (diff) | |
| download | scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.tar.gz scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.tar.bz2 scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.zip | |
Merge pull request #260 from lordhoto/new-chooser.
New save/load chooser
Conflicts:
gui/saveload.cpp
Diffstat (limited to 'gui/gui-manager.cpp')
| -rw-r--r-- | gui/gui-manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index abd781e1a3..a0ef4216aa 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -381,7 +381,7 @@ void GuiManager::runLoop() { if (tooltipCheck && _lastMousePosition.time + kTooltipDelay < _system->getMillis()) { Widget *wdg = activeDialog->findWidget(_lastMousePosition.x, _lastMousePosition.y); - if (wdg && wdg->getTooltip() && !(wdg->getFlags() & WIDGET_PRESSED)) { + if (wdg && wdg->hasTooltip() && !(wdg->getFlags() & WIDGET_PRESSED)) { Tooltip *tooltip = new Tooltip(); tooltip->setup(activeDialog, wdg, _lastMousePosition.x, _lastMousePosition.y); tooltip->runModal(); |