From 74edad10e7c84c5f80a9180304a69cc4d4da1516 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Wed, 3 Jul 2013 23:56:41 +0200
Subject: [PATCH] Fixed regression in previous commit.

---
 src/model_jobList.cpp   | 2 +-
 src/version.h           | 4 ++--
 src/win_main.cpp        | 2 +-
 src/win_preferences.cpp | 6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/model_jobList.cpp b/src/model_jobList.cpp
index b5463fa..ef675e4 100644
--- a/src/model_jobList.cpp
+++ b/src/model_jobList.cpp
@@ -285,7 +285,7 @@ QModelIndex JobListModel::insertJob(EncodeThread *thread)
 	m_details.insert(id, tr("Not started yet."));
 	endInsertRows();
 
-	connect(thread, SIGNAL(statusChanged(QUuid, EncodeThread::JobStatus)), this, SLOT(updateStatus(QUuid, EncodeThread::JobStatus)), Qt::QueuedConnection);
+	connect(thread, SIGNAL(statusChanged(QUuid, JobStatus)), this, SLOT(updateStatus(QUuid, JobStatus)), Qt::QueuedConnection);
 	connect(thread, SIGNAL(progressChanged(QUuid, unsigned int)), this, SLOT(updateProgress(QUuid, unsigned int)), Qt::QueuedConnection);
 	connect(thread, SIGNAL(messageLogged(QUuid, QString)), logFile, SLOT(addLogMessage(QUuid, QString)), Qt::QueuedConnection);
 	connect(thread, SIGNAL(detailsChanged(QUuid, QString)), this, SLOT(updateDetails(QUuid, QString)), Qt::QueuedConnection);
diff --git a/src/version.h b/src/version.h
index d75aae3..edd8fe0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -21,8 +21,8 @@
 
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 1
-#define VER_X264_PATCH 5
-#define VER_X264_BUILD 497
+#define VER_X264_PATCH 6
+#define VER_X264_BUILD 502
 
 #define VER_X264_MINIMUM_REV 2282
 #define VER_X264_CURRENT_API 133
diff --git a/src/win_main.cpp b/src/win_main.cpp
index 6399eeb..598fbc2 100644
--- a/src/win_main.cpp
+++ b/src/win_main.cpp
@@ -84,7 +84,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures)
 	//Register meta types
 	qRegisterMetaType<QUuid>("QUuid");
 	qRegisterMetaType<QUuid>("DWORD");
-	qRegisterMetaType<JobStatus>("EncodeThread::JobStatus");
+	qRegisterMetaType<JobStatus>("JobStatus");
 
 	//Load preferences
 	m_preferences = new PreferencesModel();
diff --git a/src/win_preferences.cpp b/src/win_preferences.cpp
index 0ab463c..19b8d81 100644
--- a/src/win_preferences.cpp
+++ b/src/win_preferences.cpp
@@ -44,6 +44,12 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, PreferencesModel *preferen
 	setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
 	setFixedSize(minimumSize());
 
+	if(WId hWindow = this->winId())
+	{
+		HMENU hMenu = GetSystemMenu(hWindow, 0);
+		EnableMenuItem(hMenu, SC_CLOSE, MF_BYCOMMAND | MF_GRAYED);
+	}
+	
 	labelRunNextJob->installEventFilter(this);
 	labelUse10BitEncoding->installEventFilter(this);
 	labelUse64BitAvs2YUV->installEventFilter(this);