mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

fixed unintended search execution on startup/profile-change

Browse Source
This commit is contained in:
Martin Wagner 2021-03-20 15:58:42 +01:00
parent 6885187b09
commit 02cee37690
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/mpdevil
View File

@ -1809,8 +1809,8 @@ class SearchWindow(Gtk.Box):
column_time.set_sort_column_id(4) column_time.set_sort_column_id(4)
# connect # connect
self.search_entry.connect("search-changed", self._search) self._search_entry_changed=self.search_entry.connect("search-changed", self._search)
self._tag_combo_box.connect("changed", self._search) self._tag_combo_box_changed=self._tag_combo_box.connect("changed", self._search)
self._client.emitter.connect("reconnected", self._on_reconnected) self._client.emitter.connect("reconnected", self._on_reconnected)
self._client.emitter.connect("disconnected", self._on_disconnected) self._client.emitter.connect("disconnected", self._on_disconnected)
@ -1826,9 +1826,13 @@ class SearchWindow(Gtk.Box):
def _clear(self, *args): def _clear(self, *args):
if self._done: if self._done:
self.search_entry.handler_block(self._search_entry_changed)
self._tag_combo_box.handler_block(self._tag_combo_box_changed)
self._songs_view.clear() self._songs_view.clear()
self.search_entry.set_text("") self.search_entry.set_text("")
self._tag_combo_box.remove_all() self._tag_combo_box.remove_all()
self.search_entry.handler_unblock(self._search_entry_changed)
self._tag_combo_box.handler_unblock(self._tag_combo_box_changed)
elif not self._clear in self._pending: elif not self._clear in self._pending:
self._stop_flag=True self._stop_flag=True
self._pending.append(self._clear) self._pending.append(self._clear)
@ -1840,6 +1844,7 @@ class SearchWindow(Gtk.Box):
def _on_reconnected(self, *args): def _on_reconnected(self, *args):
if self._done: if self._done:
self._tag_combo_box.handler_block(self._tag_combo_box_changed)
self._tag_combo_box.append_text(_("all tags")) self._tag_combo_box.append_text(_("all tags"))
for tag in self._client.wrapped_call("tagtypes"): for tag in self._client.wrapped_call("tagtypes"):
if not tag.startswith("MUSICBRAINZ"): if not tag.startswith("MUSICBRAINZ"):
@ -1847,6 +1852,7 @@ class SearchWindow(Gtk.Box):
self._tag_combo_box.set_active(0) self._tag_combo_box.set_active(0)
self._tag_combo_box.set_sensitive(True) self._tag_combo_box.set_sensitive(True)
self.search_entry.set_sensitive(True) self.search_entry.set_sensitive(True)
self._tag_combo_box.handler_unblock(self._tag_combo_box_changed)
elif not self._on_reconnected in self._pending: elif not self._on_reconnected in self._pending:
self._stop_flag=True self._stop_flag=True
self._pending.append(self._on_reconnected) self._pending.append(self._on_reconnected)