Changeset 10972

Timestamp:

03/02/10 04:39:03 (2 years ago)

Author:

azawawi

Message:

Fixed ticket:807 "F2 is broken"

File:

• trunk/Padre/lib/Padre/Wx/Dialog/HelpSearch.pm (modified) (5 diffs)

trunk/Padre/lib/Padre/Wx/Dialog/HelpSearch.pm

@@ -276 +276 @@
             sub {
                 $self->_index(undef);
-                $self->_update_list_box;
-                $self->_search_text->Enable(1);
-                $self->_topic_selector->Enable(1);
-                $self->_list->Enable(1);
-                $self->_search_text->SetFocus();
+                if( $self->_update_list_box ) {
+                    $self->_search_text->Enable(1);
+                    $self->_topic_selector->Enable(1);
+                    $self->_list->Enable(1);
+                    $self->_search_text->SetFocus();
+                } else {
+                    $self->_search_text->ChangeValue('');
+                }
                 Wx::Event::EVT_IDLE( $self, undef );
             }
@@ -296 +299 @@
     my $self = shift;
 
-    # a default..
-    my @empty = ();
-    $self->_index( \@empty );
-
-    # TODO: If the _help_provide call crashes then this _search seem to be called in a recursive loop
-    # until the whole applications freezes.
     # Generate a sorted file-list based on filename
     if ( not $self->_help_provider ) {
@@ -371 +368 @@
     my $self = shift;
 
-    if ( not $self->_index ) {
-        $self->_search;
-    }
+    # Clear the list
+    $self->_list->Clear();
+
+    # Try to fetch a help index and return nothing if otherwise
+    $self->_search unless $self->_index;
+    return unless $self->_index;
 
     my $search_expr = $self->_search_text->GetValue();
@@ -379 +379 @@
 
     #Populate the list box now
-    $self->_list->Clear();
     my $pos = 0;
     foreach my $target ( @{ $self->_index } ) {
@@ -396 +395 @@
     $self->_display_help_in_viewer;
 
-    return;
+    return 1;
 }