projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
6938289
)
Correctly wait for render thread to exit
author
Aaron Kennedy
<aaron.kennedy@nokia.com>
Wed, 22 Jun 2011 08:11:06 +0000 (18:11 +1000)
committer
Aaron Kennedy
<aaron.kennedy@nokia.com>
Wed, 22 Jun 2011 08:11:06 +0000 (18:11 +1000)
src/declarative/items/qsgcanvas.cpp
patch
|
blob
|
history
diff --git
a/src/declarative/items/qsgcanvas.cpp
b/src/declarative/items/qsgcanvas.cpp
index
0500b75
..
97d643d
100644
(file)
--- a/
src/declarative/items/qsgcanvas.cpp
+++ b/
src/declarative/items/qsgcanvas.cpp
@@
-2316,6
+2316,13
@@
void QSGCanvasRenderThread::stopRenderThread()
}
unlockInGui();
+
+#ifdef THREAD_DEBUG
+ printf("GUI: waiting for render thread to terminate..\n");
+#endif
+ // Actually wait for the thread to terminate. Otherwise we can delete it
+ // too early and crash.
+ QThread::wait();
}