From a12cd98dda74b9ffa8729a58959bc7ab41118cf0 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 1 Jul 2010 17:50:45 +1000
Subject: Fix bug in SameGame's dialog component

Was emitting closed after already being closed.

Task-number: QTBUG-11812
---
 demos/declarative/samegame/SamegameCore/Dialog.qml | 2 ++
 demos/declarative/samegame/samegame.qml            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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;
-- 
cgit v0.12