Delay starting the thread until after we have initialized the context.

The order should be:
 1. initialize / create thread context
 2. start thread
 3. make thread context current in thread
 4. upload, upload, upload...

1 files changed, 3 insertions, 1 deletions

diff --git a/src/adaptationlayers/threadedtexturemanager.cpp b/src/adaptationlayers/threadedtexturemanager.cpp
index 665dbd9..46f06a0 100644
--- a/src/adaptationlayers/threadedtexturemanager.cpp
+++ b/src/adaptationlayers/threadedtexturemanager.cpp
@@ -27,7 +27,6 @@ public:
     QSGTTMUploadThread(QSGThreadedTextureManager *m)
         : manager(m)
     {
-        start();
     }
 
     void run() {
@@ -86,6 +85,7 @@ const TextureReference *QSGThreadedTextureManager::requestUploadedTexture(const
     if (!d->thread) {
         d->thread = new QSGTTMUploadThread(this);
         initializeThreadContext();
+        d->thread->start();
     }
 
     Q_ASSERT(!image.isNull());
@@ -132,6 +132,8 @@ void QSGThreadedTextureManager::initializeThreadContext()
     d->widget->resize(8, 8);
 
     d->context = const_cast<QGLContext *>(d->widget->context());
+    if (!d->context)
+        qFatal("QSGThreadedTextureManager: failed to create thread context...");
 
     d->widget->doneCurrent();