fix ui freezes

timoloewe · Apr 22, 2014 · eba0a49 · eba0a49
1 parent 2e482d6
commit eba0a49
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/lLyrics/lLyrics.py b/lLyrics/lLyrics.py
@@ -569,7 +569,7 @@ def build_cache_path(self, artist, title):
     def scan_selected_source_callback(self, action, activated_action):
         if not action.get_active():
             return 
-
+        
         source = activated_action
         if source == "SelectNothing" or source == self.current_source:
             return
@@ -607,10 +607,8 @@ def search_online_action_callback(self, action):
     def instrumental_action_callback(self, action):
         lyrics = "-- Instrumental --"
         self.write_lyrics_to_cache(self.path, lyrics)
-        Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self.show_lyrics, lyrics)
-
-        self.set_radio_menu_item_active("SelectNothing")
         self.current_source = None
+        Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self.show_lyrics, lyrics)
 
 
 
@@ -854,7 +852,6 @@ def _scan_all_sources_thread(self, artist, title, cache):
                     self._scan_all_sources_thread(self.clean_artist, self.clean_title, False)
                     return    
 
-            Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self.set_radio_menu_item_active, "SelectNothing")
             self.current_source = None  
 
         Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self.set_menu_sensitive, True)
@@ -863,7 +860,9 @@ def _scan_all_sources_thread(self, artist, title, cache):
 
 
 
-    def get_lyrics_from_cache(self, path):        
+    def get_lyrics_from_cache(self, path): 
+        self.current_source = "From cache file"
+
         # try to load lyrics from cache
         if os.path.exists (path):
             try:
@@ -872,10 +871,9 @@ def get_lyrics_from_cache(self, path):
                 cachefile.close()
             except:
                 print("error reading cache file")
+                return ""
 
             print("got lyrics from cache")
-            self.current_source = "From cache file"
-            Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self.set_radio_menu_item_active, _("From cache file"))
             return lyrics
 
         return ""
@@ -900,7 +898,6 @@ def get_lyrics_from_source(self, source, artist, title):
 
         print("source: " + source)        
         self.current_source = source
-        Gdk.threads_add_idle(GLib.PRIORITY_DEFAULT_IDLE, self.set_radio_menu_item_active, source)
 
         parser = self.dict[source].Parser(artist, title)
         try:
@@ -923,6 +920,13 @@ def get_lyrics_from_source(self, source, artist, title):
 
 
     def show_lyrics(self, lyrics):
+        if self.current_source is None:
+            self.set_radio_menu_item_active("SelectNothing")
+        elif self.current_source == "From cache file":
+            self.set_radio_menu_item_active(_("From cache file"))
+        else:
+            self.set_radio_menu_item_active(self.current_source)
+
         if lyrics == "":
             print("no lyrics found")
             lyrics = _("No lyrics found")