openlp-core team mailing list archive

[Gabriel Loo <gabriel.loo@xxxxxxxxx>]

Gabriel Loo has proposed merging lp:~gabriel-loo/openlp/songselectimportfix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1570228 in OpenLP: "App crashes on SongSelect Importer search"
  https://bugs.launchpad.net/openlp/+bug/1570228

For more details, see:
https://code.launchpad.net/~gabriel-loo/openlp/songselectimportfix/+merge/292045

Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault).
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~gabriel-loo/openlp/songselectimportfix into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/songselectform.py'
--- openlp/plugins/songs/forms/songselectform.py	2016-01-10 16:01:43 +0000
+++ openlp/plugins/songs/forms/songselectform.py	2016-04-15 19:40:38 +0000
@@ -299,6 +299,7 @@
         # Set up UI components
         self.view_button.setEnabled(False)
         self.search_button.setEnabled(False)
+        self.search_combobox.setEnabled(False)
         self.search_progress_bar.setMinimum(0)
         self.search_progress_bar.setMaximum(0)
         self.search_progress_bar.setValue(0)
@@ -354,6 +355,7 @@
         self.application.process_events()
         self.set_progress_visible(False)
         self.search_button.setEnabled(True)
+        self.search_combobox.setEnabled(True)
         self.application.process_events()
 
     def on_search_results_widget_selection_changed(self):