Fix an assertion in QDeclarativeNotifierEndpoint
authorLars Knoll <lars.knoll@nokia.com>
Fri, 16 Sep 2011 11:47:45 +0000 (13:47 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 16 Sep 2011 13:08:15 +0000 (15:08 +0200)
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>

src/declarative/qml/qdeclarativenotifier_p.h

index 6119517..6974ea2 100644 (file)
@@ -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;
 }