Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

1 files changed, 11 insertions, 3 deletions

diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc
index f6d6d261..c49b8769 100644
--- a/gui/ice40/worker.cc
+++ b/gui/ice40/worker.cc
@@ -35,7 +35,7 @@ struct WorkerInterruptionRequested
 {
 };
 
-Worker::Worker(Context *_ctx, TaskManager *parent) : ctx(_ctx)
+Worker::Worker(TaskManager *parent) : ctx(nullptr)
 {
     log_write_function = [this, parent](std::string text) {
         Q_EMIT log(text);
@@ -56,6 +56,11 @@ Worker::Worker(Context *_ctx, TaskManager *parent) : ctx(_ctx)
     };
 }
 
+void Worker::newContext(Context *ctx_)
+{
+    ctx = ctx_;
+}
+
 void Worker::loadfile(const std::string &filename)
 {
     Q_EMIT taskStarted();
@@ -136,9 +141,9 @@ void Worker::route()
     }
 }
 
-TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false)
+TaskManager::TaskManager() : toTerminate(false), toPause(false)
 {
-    Worker *worker = new Worker(ctx, this);
+    Worker *worker = new Worker(this);
     worker->moveToThread(&workerThread);
 
     connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
@@ -151,6 +156,9 @@ TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false)
     connect(this, &TaskManager::place, worker, &Worker::place);
     connect(this, &TaskManager::route, worker, &Worker::route);
 
+
+    connect(this, &TaskManager::contextChanged, worker, &Worker::newContext);
+
     connect(worker, &Worker::log, this, &TaskManager::info);
     connect(worker, &Worker::loadfile_finished, this, &TaskManager::loadfile_finished);
     connect(worker, &Worker::loadpcf_finished, this, &TaskManager::loadpcf_finished);