From 63050a31b8ec0c72aeffe873a13a66603e4a250f Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sun, 25 Dec 2011 23:16:45 +0100
Subject: fixed recently introduced locking bug


diff --git a/src/mainwin.cc b/src/mainwin.cc
index a3ec72f..5c81554 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -144,7 +144,8 @@ MainWindow::MainWindow(const QString &filename)
 	setupUi(this);
 
 	this->cgalworker = new CGALWorker();
-	connect(this->cgalworker, SIGNAL(done(CGAL_Nef_polyhedron *)), this, SLOT(actionRenderCGALDone(CGAL_Nef_polyhedron *)));
+	connect(this->cgalworker, SIGNAL(done(CGAL_Nef_polyhedron *)), 
+					this, SLOT(actionRenderCGALDone(CGAL_Nef_polyhedron *)));
 
 	register_builtin(root_ctx);
 
@@ -1132,7 +1133,7 @@ void MainWindow::actionCompile()
 void MainWindow::actionRenderCGAL()
 {
 	if (GuiLocker::isLocked()) return;
-	GuiLocker::lock();
+	GuiLocker lock;
 
 	setCurrentOutput();
 	console->clear();
@@ -1161,6 +1162,7 @@ void MainWindow::actionRenderCGAL()
 
 	progress_report_prep(this->root_node, report_func, this);
 
+	GuiLocker::lock(); // Will be unlocked in actionRenderCGALDone()
 	this->cgalworker->start(this->tree);
 }
 
-- 
cgit v0.10.1