check if lastSeenLine is null before trying to display it in OptionsListView.cs

Author: dogboydog

Samples/Space/Dialogue/Intro.yarn

@@ -3,5 +3,6 @@ title: SpaceIntro
 tags:
 ---
 <<declare $sampleName to "Space">>
+-> Test
 Welcome to the {$sampleName} Sample! Try talking to Sally and the Ship. #line:03f451b 
 ===

addons/YarnSpinner-Godot/Runtime/Views/OptionsListView.cs

@@ -122,7 +122,7 @@ private async void RunOptionsInternal(DialogueOption[] dialogueOptions, Action<i
             }
 
             // Update the last line, if one is configured
-            if (IsInstanceValid(lastLineText))
+            if (IsInstanceValid(lastLineText) && lastSeenLine != null)
             {
                 var line = lastSeenLine.Text;
                 lastLineText.Visible = true;
@@ -195,6 +195,7 @@ async Task OptionViewWasSelectedInternal(DialogueOption selectedOption)
                     OnOptionSelected(selectedOption.DialogueOptionID);
                 }
             }
+
             // If the user is hiding unavailable options, select the first visible one.
             optionViews.First(view => view.Visible).GrabFocus();
         }
@@ -207,16 +208,15 @@ async Task OptionViewWasSelectedInternal(DialogueOption selectedOption)
     /// <inheritdoc />
     public void DialogueComplete()
     {
-        // do we still have a line lying around?
-        if (viewControl.Visible)
+        lastSeenLine = null;
+        OnOptionSelected = null;
+        if (IsInstanceValid(lastLineText))
         {
-            lastSeenLine = null;
-            OnOptionSelected = null;
-            if (lastLineText != null)
-            {
-                lastLineText.Visible = false;
-            }
+            lastLineText.Visible = false;
+        }
 
+        if (viewControl.Visible)
+        {
             viewControl.Visible = false;
             Effects.FadeAlpha(viewControl, viewControl.Modulate.A, 0, fadeTime)
                 .ContinueWith(failedTask =>

addons/YarnSpinner-Godot/Scenes/OptionView.tscn

@@ -32,11 +32,11 @@ alignment = 1
 layout_mode = 2
 size_flags_vertical = 6
 mouse_filter = 2
-theme_override_font_sizes/normal_font_size = 24
-theme_override_font_sizes/bold_font_size = 24
-theme_override_font_sizes/italics_font_size = 24
 theme_override_font_sizes/bold_italics_font_size = 24
+theme_override_font_sizes/italics_font_size = 24
 theme_override_font_sizes/mono_font_size = 24
+theme_override_font_sizes/normal_font_size = 24
+theme_override_font_sizes/bold_font_size = 24
 bbcode_enabled = true
 text = "[center]Option View[/center]"
 fit_content = true

addons/YarnSpinner-Godot/Scenes/RoundedOptionView.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="StyleBox" uid="uid://itxqi5xpilu6" path="res://addons/YarnSpinner-Godot/Scenes/RoundedViewStylebox.tres" id="1_brfok"]
 [ext_resource type="Script" path="res://addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs" id="1_uv0oc"]
-[ext_resource type="StyleBox" uid="uid://cqadffkf802cr" path="res://addons/YarnSpinner-Godot/Scenes/RoundedViewFocusedStylebox.tres" id="2_tuu8c"]
+[ext_resource type="StyleBox" uid="uid://cqadffkf802cr" path="res://addons/YarnSpinner-Godot/Scenes/RoundedViewFocusedStyleBox.tres" id="2_tuu8c"]
 
 [node name="OptionView" type="Button" node_paths=PackedStringArray("label")]
 anchors_preset = 7
@@ -19,11 +19,11 @@ grow_vertical = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme_override_font_sizes/font_size = 36
-theme_override_styles/normal = ExtResource("1_brfok")
+theme_override_styles/focus = ExtResource("2_tuu8c")
+theme_override_styles/disabled = ExtResource("1_brfok")
 theme_override_styles/hover = ExtResource("1_brfok")
 theme_override_styles/pressed = ExtResource("1_brfok")
-theme_override_styles/disabled = ExtResource("1_brfok")
-theme_override_styles/focus = ExtResource("2_tuu8c")
+theme_override_styles/normal = ExtResource("1_brfok")
 script = ExtResource("1_uv0oc")
 label = NodePath("VBoxContainer/RichTextLabel")
 
@@ -41,19 +41,19 @@ alignment = 1
 layout_mode = 2
 size_flags_vertical = 6
 mouse_filter = 2
+theme_override_colors/table_border = Color(0, 0, 0, 1)
+theme_override_colors/table_even_row_bg = Color(0, 0, 0, 1)
+theme_override_colors/table_odd_row_bg = Color(0, 0, 0, 1)
 theme_override_colors/default_color = Color(0, 0, 0, 1)
 theme_override_colors/font_selected_color = Color(0, 0, 0, 1)
 theme_override_colors/selection_color = Color(0, 0, 0, 1)
-theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
-theme_override_colors/table_odd_row_bg = Color(0, 0, 0, 1)
-theme_override_colors/table_even_row_bg = Color(0, 0, 0, 1)
-theme_override_colors/table_border = Color(0, 0, 0, 1)
-theme_override_font_sizes/normal_font_size = 24
-theme_override_font_sizes/bold_font_size = 24
-theme_override_font_sizes/italics_font_size = 24
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 theme_override_font_sizes/bold_italics_font_size = 24
+theme_override_font_sizes/italics_font_size = 24
 theme_override_font_sizes/mono_font_size = 24
+theme_override_font_sizes/normal_font_size = 24
+theme_override_font_sizes/bold_font_size = 24
 bbcode_enabled = true
 text = "[center]Option View[/center]"
 fit_content = true