diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-07-01 07:50:45 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-07-01 07:50:45 (GMT) |
| commit | a12cd98dda74b9ffa8729a58959bc7ab41118cf0 (patch) | |
| tree | 34529fa8fe1af931f5c8e3604f2c3ec38e9dcbbb /demos | |
| parent | 7e985adfbe41ee3cf92b7078e5423dfded1731f5 (diff) | |
| download | Qt-a12cd98dda74b9ffa8729a58959bc7ab41118cf0.zip Qt-a12cd98dda74b9ffa8729a58959bc7ab41118cf0.tar.gz Qt-a12cd98dda74b9ffa8729a58959bc7ab41118cf0.tar.bz2 | |
Fix bug in SameGame's dialog component
Was emitting closed after already being closed.
Task-number: QTBUG-11812
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/samegame/SamegameCore/Dialog.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml index c71a4b3..7e64bd6 100644 --- a/demos/declarative/samegame/SamegameCore/Dialog.qml +++ b/demos/declarative/samegame/SamegameCore/Dialog.qml @@ -49,6 +49,8 @@ Rectangle { signal closed signal opened function forceClose() { + if(page.opacity == 0) + return; //already closed page.closed(); page.opacity = 0; } diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 10bf79f..9504fb6 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -88,7 +88,7 @@ Rectangle { Behavior on width { NumberAnimation {} - enabled: initialWidth != 0 + enabled: nameInputDialog.initialWidth != 0 } onOpened: nameInputText.focus = true; |