From: Lars Knoll <lars.knoll@nokia.com>
Date: Fri, 16 Sep 2011 11:47:45 +0000 (+0200)
Subject: Fix an assertion in QDeclarativeNotifierEndpoint
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5eab92e9a3017067fe3e4c84832661c8213245f4;p=konrad%2Fqtdeclarative.git

Fix an assertion in QDeclarativeNotifierEndpoint

The code in toNotifier() tried to convert to a
Notifier, and called asNotifier() before setting
the type correctly.

Change-Id: I2d4c41c6bf43422587111ae4e0c57a3905f159e0
Reviewed-on: http://codereview.qt-project.org/5089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---

diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h
index 6119517..6974ea2 100644
--- a/src/declarative/qml/qdeclarativenotifier_p.h
+++ b/src/declarative/qml/qdeclarativenotifier_p.h
@@ -230,12 +230,12 @@ QDeclarativeNotifierEndpoint::Notifier *QDeclarativeNotifierEndpoint::toNotifier
         s->~Signal();
     }
 
+    type = NotifierType;
     Notifier *n = asNotifier();
     n->next = 0;
     n->prev = 0;
     n->disconnected = 0;
     n->notifier = 0;
-    type = NotifierType;
     return n;
 }