- fixing a dict Key error that will make some stations fail - #284

- fixing an error that would render all player unusable on Windows - #282
- fixing Windows getting stuck to "PyRadio still running" message - #283

Author: s-n-g

pyradio/common.py

@@ -856,7 +856,7 @@ def get_config_files(cls):
         if platform.startswith('win'):
             if exists(r'C:\\mplayer\\mplayer.exe'):
                 config_files[0] = r'C:\\mplayer\mplayer\\config'
-            elif exists(os.path.join(getenv('USERPROFILE'), "mplayer", "mplayer.exe")):
+            elif exists(join(getenv('USERPROFILE'), "mplayer", "mplayer.exe")):
                 config_files[0] = join(getenv('USERPROFILE'), "mplayer", "mplayer", "config")
             elif exists(join(getenv('APPDATA'), "pyradio", "mplayer", "mplayer.exe")):
                 config_files[0] = join(getenv('APPDATA'), "pyradio", "mplayer", "mplayer", "config")

pyradio/install.py

@@ -212,6 +212,7 @@ def is_process_running(process_name):
     return False
 
 def isRunning():
+    return
     count = 1
     ctypes.windll.kernel32.SetConsoleTitleW('PyRadio Installation')
     while is_process_running('pyradio.exe'):

pyradio/player.py

@@ -1178,7 +1178,7 @@ def updateStatus(self, *args):
                         try:
                             if self._can_update_br(self._icy_data['icy-br']):
                                 self.update_bitrate(self._icy_data['icy-br'])
-                        except IndexError:
+                        except KeyError:
                             pass
                         self.info_display_handler()
         except:
@@ -1764,7 +1764,7 @@ def do_crash_detection(detect_if_player_exited, stop):
                         try:
                             if self._can_update_br(self._icy_data['icy-br']):
                                 self.update_bitrate(self._icy_data['icy-br'])
-                        except IndexError:
+                        except KeyError:
                             pass
                         self.info_display_handler()
         except:
@@ -1981,7 +1981,7 @@ def _get_mpv_metadata(self, *args):
             try:
                 if self._can_update_br(self._icy_data['icy-br']):
                     self.update_bitrate(self._icy_data['icy-br'])
-            except IndexError:
+            except KeyError:
                 pass
             return True