From 2d2d237e444287711222e1826c4181e0a6e85c98 Mon Sep 17 00:00:00 2001
From: ReikoKitsune <exvoided@gmail.com>
Date: Tue, 15 Mar 2016 14:14:42 +0300
Subject: [PATCH] Corect char comboBox behavior.

---
 src/NFirmwareEditor/MainWindow.cs | 33 ++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/NFirmwareEditor/MainWindow.cs b/src/NFirmwareEditor/MainWindow.cs
index 5898725..4fb42bb 100644
--- a/src/NFirmwareEditor/MainWindow.cs
+++ b/src/NFirmwareEditor/MainWindow.cs
@@ -512,6 +512,7 @@ private void RemoveStringEditControls()
 
 		private void CreateStringEditControls(byte[] firmwareString, IDictionary<int, Image> imageCache)
 		{
+			var nullByteFound = false;
 			for (var i = 0; i < firmwareString.Length; i++)
 			{
 				if (i == firmwareString.Length - 1 && firmwareString[i] == 0x00) continue;
@@ -526,8 +527,7 @@ private void CreateStringEditControls(byte[] firmwareString, IDictionary<int, Im
 					ForeColor = Color.White,
 					Tag = new Tuple<FirmwareStringMetadata, int>(LastSelectedStringMetadata, i)
 				};
-				icb.Items.Add(nullItem);
-
+				if (i > 0) icb.Items.Add(nullItem);
 				var selectedItem = nullItem;
 				foreach (var imageMetadata in CurrentImageBlockForStrings)
 				{
@@ -540,7 +540,9 @@ private void CreateStringEditControls(byte[] firmwareString, IDictionary<int, Im
 				}
 				icb.SelectedItem = selectedItem;
 				icb.SelectedValueChanged += Icb_SelectedValueChanged;
+				icb.Enabled = !nullByteFound;
 				CharLayoutPanel.Controls.Add(icb);
+				nullByteFound = (byte)selectedItem.Value == 0x00;
 			}
 		}
 
@@ -555,8 +557,33 @@ private void Icb_SelectedValueChanged(object sender, EventArgs e)
 			if (tag == null) return;
 			if (item == null) return;
 
-			m_firmware.WriteChar((byte)item.Value, tag.Item2, tag.Item1);
+			var value = (byte)item.Value;
+			var idx = CharLayoutPanel.Controls.IndexOf(icb);
+
+			m_firmware.WriteChar(value, tag.Item2, tag.Item1);
 			UpdateStringPreview();
+
+			if (value == 0x00)
+			{
+				for (var i = idx + 1; i < CharLayoutPanel.Controls.Count; i++)
+				{
+					var relatedIcb = CharLayoutPanel.Controls[i] as ImagedComboBox;
+					if (relatedIcb == null) continue;
+
+					relatedIcb.SelectedIndex = 0;
+					relatedIcb.Enabled = false;
+				}
+			}
+			else if (idx + 1 < CharLayoutPanel.Controls.Count)
+			{
+				var relatedIcb = CharLayoutPanel.Controls[idx + 1] as ImagedComboBox;
+				if (relatedIcb == null) return;
+
+				if (relatedIcb.SelectedIndex == 0 && !relatedIcb.Enabled)
+				{
+					relatedIcb.Enabled = true;
+				}
+			}
 		}
 
 		private void UpdateStringPreview()