0.9.5.2 - Peppermint: Fix exception on Add Conditional dialog

About.resx

@@ -651,7 +651,10 @@ SOFTWARE.</value>
 </value>
   </data>
   <data name="ChangelogBox.Text" xml:space="preserve">
-    <value>0.9.5.1 - Cocoa:
+    <value>0.9.5.2 - Peppermint:
+   * Fixed exception on Add Conditional dialog when using main editor options
+
+0.9.5.1 - Cocoa:
    * Removed debug PropertyGrid from editor
 
 0.9.5 - Chocolate Milk:

AddConditional.resx

@@ -129,7 +129,7 @@
         iAVkBSI0GtcDMSOKASTg+0AsCNYMAiADKMFYBUnBWAWJx/8ZAJTvnaUbCipuAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="FastColoredTextBox1.ServiceColors" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="Display.ServiceColors" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdGYXN0Q29sb3JlZFRleHRCb3gsIFZlcnNpb249Mi4xNi4yNi4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWZiOGFhMTJiOTk0ZWY2MWIMAwAAAFFTeXN0

AddConditional.vb

@@ -4,18 +4,16 @@ Public Class AddConditional
     Public output = ""
 
     Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-        Dim out = ""
         Dim ineq = ""
         If Yesnt.Checked Then
             ineq = "!"
         End If
-        For Each line In FastColoredTextBox1.Lines
-            If Not out = "" Then
-                out &= vbNewLine
+        For Each line In Display.Lines
+            If Not output = "" Then
+                output &= vbNewLine
             End If
-            out &= "[" & Attribute.Text & ineq & "=" & EqualsTxt.Text & "]" & line.Replace(vbNewLine, "").Replace("\n", "") & "[/" & Attribute.Text & ineq & "=]"
+            output &= "[" & Attribute.Text & ineq & "=" & EqualsTxt.Text & "]" & line.Replace(vbNewLine, "").Replace("\n", "") & "[/" & Attribute.Text & ineq & "=]"
         Next
-        output = out
         Me.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.Close()
     End Sub
@@ -29,9 +27,9 @@ Public Class AddConditional
         For Each att As TreeNode In Form1.AttributeTree.Nodes
             Attribute.Items.Add(att.Text)
         Next
-        output.WordWrap = My.Settings.WordWrap
-        output.VirtualSpace = My.Settings.VirtualSpace
-        output.Code.WideCaret = My.Settings.WideCaret
-        output.Code.Font = My.Settings.editorFont
+        Display.WordWrap = My.Settings.WordWrap
+        Display.VirtualSpace = My.Settings.VirtualSpace
+        Display.WideCaret = My.Settings.WideCaret
+        Display.Font = My.Settings.editorFont
     End Sub
 End Class

My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.9.5.1")> 
+<Assembly: AssemblyVersion("0.9.5.2")> 
 <Assembly: AssemblyFileVersion("0.0.0.0")>