From bb2702f899968cf6d90965b4408d5ae1f241447b Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Wed, 16 Apr 2014 21:27:27 +0200
Subject: [PATCH] Make sure comboxboxes are *not* initialized yet, so loading
 the template will update the GUI.

---
 gui/win_addJob.ui | 12 +++++++++---
 src/version.h     |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gui/win_addJob.ui b/gui/win_addJob.ui
index 1c1d37a..a3111d7 100644
--- a/gui/win_addJob.ui
+++ b/gui/win_addJob.ui
@@ -250,6 +250,9 @@
                <property name="toolTip">
                 <string>Choose the &lt;b&gt;encoder&lt;/b&gt; to be used (e.g. x264 vs. x265). This also decides which output &lt;i&gt;format&lt;/i&gt; you will get (e.g. H.264 vs. HEVC).</string>
                </property>
+               <property name="currentIndex">
+                <number>-1</number>
+               </property>
                <item>
                 <property name="text">
                  <string>x264 (AVC)</string>
@@ -298,7 +301,7 @@
                 <string>Choose the &lt;b&gt;architecture&lt;/b&gt; of the encoder (e.g. 32-Bit vs. 64-Bit). Generally the &quot;native&quot; architecture of your system should give the best performance.</string>
                </property>
                <property name="currentIndex">
-                <number>1</number>
+                <number>-1</number>
                </property>
                <item>
                 <property name="text">
@@ -347,6 +350,9 @@
                <property name="toolTip">
                 <string>Choose the &lt;b&gt;variant&lt;/b&gt; of the encoder (e.g. 8-Bit vs. 10-Bit). If you don't know which variant you need, stick with the &lt;i&gt;default&lt;/i&gt; one!</string>
                </property>
+               <property name="currentIndex">
+                <number>-1</number>
+               </property>
                <item>
                 <property name="text">
                  <string>8-Bit</string>
@@ -417,7 +423,7 @@
                 <string>Select the &lt;b&gt;rate-control&lt;/b&gt; mode. Use &lt;i&gt;CRF&lt;/i&gt; mode in order to hit a specific level of quality. Or use &lt;i&gt;2-Pass&lt;/i&gt; mode in order to hit a specific file size.</string>
                </property>
                <property name="currentIndex">
-                <number>0</number>
+                <number>-1</number>
                </property>
                <item>
                 <property name="text">
@@ -610,7 +616,7 @@
                 <string>This option controls the &quot;Speed -vs- Quality&quot; trade-off of the encoder. Use a &lt;i&gt;slower&lt;/i&gt; Preset in order to improve the quality at the same bitrate (file size), at the cost of increased encoding time. Or use a &lt;i&gt;faster&lt;/i&gt; Preset in order to save encoding time, at the cost of reduced quality.</string>
                </property>
                <property name="currentIndex">
-                <number>5</number>
+                <number>-1</number>
                </property>
                <item>
                 <property name="text">
diff --git a/src/version.h b/src/version.h
index 984a2ad..aab170b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 3
 #define VER_X264_PATCH 6
-#define VER_X264_BUILD 824
+#define VER_X264_BUILD 826
 
 #define VER_X264_PORTABLE_EDITION (0)