jj

ZooFlow/frmFlowForm.vb

@@ -4,6 +4,8 @@ Public Class frmFlowForm
     Private WithEvents Watcher As ClassClipboardWatcher = ClassClipboardWatcher.Singleton
     Private ActiveModules As List(Of String)
 
+    Private CurrentState As OnFlowFormStateChangedEvent.FlowFormState = OnFlowFormStateChangedEvent.FlowFormState.Default
+
     Public Event ClipboardChanged As EventHandler(Of IDataObject)
 
     Public Sub New(ActiveModules As List(Of String))
@@ -20,6 +22,9 @@ Public Class frmFlowForm
         ShowInTaskbar = False
         SetFlowFormState(OnFlowFormStateChangedEvent.FlowFormState.Default)
 
+        ' === Register Events ===
+        AddHandler Click, AddressOf frmFlowForm_Click
+
         ' === Register As Event Listener ===
         EventBus.Instance.Register(Me)
     End Sub
@@ -28,10 +33,15 @@ Public Class frmFlowForm
         EventBus.Instance.Unregister(Me)
     End Sub
 
-    Private Sub frmFlowForm_Click(sender As Object, e As EventArgs) Handles Me.MouseClick
-        EventBus.Instance.PostEvent(New OnFlowFormInteractionEvent(OnFlowFormInteractionEvent.FlowFormInteraction.Click))
+    Private Sub frmFlowForm_Click(sender As Object, e As EventArgs)
+        If CurrentState = OnFlowFormStateChangedEvent.FlowFormState.HasSearchResults Then
+            SetFlowFormState(OnFlowFormStateChangedEvent.FlowFormState.Default)
+            EventBus.Instance.PostEvent(New OnFlowFormInteractionEvent(OnFlowFormInteractionEvent.FlowFormInteraction.Click))
+        End If
     End Sub
+
     Public Sub OnEvent(e As OnFlowFormStateChangedEvent)
+        CurrentState = e.State
         SetFlowFormState(e.State)
     End Sub