diff -r acbfd7900f99 qtgui/mainwindow.cpp
--- a/qtgui/mainwindow.cpp	Sat Jan 14 00:54:14 2012 +0100
+++ b/qtgui/mainwindow.cpp	Sun Jan 15 17:10:52 2012 -0700
@@ -38,6 +38,7 @@
 #include <clocale>
 
 #include <QProgressDialog>
+#include <QAbstractButton>
 
 #include <QList>
 
@@ -623,8 +624,13 @@
 {
 	if (m_guiRenderState == RENDERING) {
 		// Give warning that current rendering is not stopped
-		if (QMessageBox::question(this, tr("Current file is still rendering"),tr("Do you want to stop the current render and start a new one?"), QMessageBox::Yes|QMessageBox::No) == QMessageBox::No) {
-			return false;
+		QMessageBox msgBox(QMessageBox::Question, tr("Current scene is still rendering"), tr("Do you want to stop the current render and start a new one?"), QMessageBox::NoButton, this);
+		QAbstractButton *stopCurrentButton = msgBox.addButton(tr("Start new"), QMessageBox::YesRole);
+		QAbstractButton *continueCurrentButton = msgBox.addButton(tr("Continue current"), QMessageBox::NoRole);
+		msgBox.exec();
+ 
+		if(msgBox.clickedButton() == continueCurrentButton) {
+			return false;
 		}
 	}
 	// clear rendering queue

diff -r acbfd7900f99 qtgui/mainwindow.cpp
--- a/qtgui/mainwindow.cpp	Sat Jan 14 00:54:14 2012 +0100
+++ b/qtgui/mainwindow.cpp	Sun Jan 15 17:15:59 2012 -0700
@@ -623,7 +623,7 @@
 {
 	if (m_guiRenderState == RENDERING) {
 		// Give warning that current rendering is not stopped
-		if (QMessageBox::question(this, tr("Current file is still rendering"),tr("Do you want to stop the current render and start a new one?"), QMessageBox::Yes|QMessageBox::No) == QMessageBox::No) {
+		if (QMessageBox::question(this, tr("Current scene is still rendering"),tr("Stop rendering the current scene?"), QMessageBox::Yes|QMessageBox::No) == QMessageBox::No) {
 			return false;
 		}
 	}