#57 fix

Himura2la · Nov 6, 2017 · d0319b6 · d0319b6
1 parent 5114fcb
commit d0319b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/background_music_player.py b/src/background_music_player.py
@@ -27,7 +27,7 @@ def __init__(self, parent):
         self.pause_fade_speed = 0.01
 
     def window_exists(self):
-        return isinstance(self.window, BackgroundMusicFrame)
+        return bool(self.window)
 
     def show_window(self):
         if not self.window_exists():
@@ -43,11 +43,11 @@ def show_window(self):
             self.window.lock_btn.Enable(True)
 
     def load_files(self, bg_music_dir):
-        file_names = sorted(os.listdir(bg_music_dir))
-        self.playlist = [{'title': f.rsplit('.', 1)[0],
-                          'path': os.path.join(bg_music_dir, f),
+        file_paths = [os.path.join(bg_music_dir, f) for f in sorted(os.listdir(bg_music_dir))]
+        self.playlist = [{'title': os.path.basename(p).rsplit('.', 1)[0],
+                          'path': p,
                           'color': Colors.BG_NEVER_PLAYED}
-                         for f in file_names if os.path.isfile(f) and f.rsplit('.', 1)[1] in FileTypes.audio_extensions]
+                         for p in file_paths if os.path.isfile(p) and os.path.basename(p).rsplit('.', 1)[1] in FileTypes.audio_extensions]
         if self.window_exists():
             self.load_playlist_to_grid()
 
@@ -272,6 +272,8 @@ def select_row(e):
         self.SetSizer(main_sizer)
         self.Layout()
 
+        self.Bind(wx.EVT_CLOSE, parent.on_bg_player_win_close)
+
     def set_volume_from_slider(self, e=None):
         self.parent.background_volume = self.vol_slider.GetValue()  # Forwards to player
         self.vol_label.SetLabel('VOL: %d' % self.parent.background_volume)  # Gets from player

diff --git a/src/main.pyw b/src/main.pyw
@@ -337,7 +337,8 @@ class MainFrame(wx.Frame):
                 on_settings()
             else:
                 self.load_files()
-                self.on_bg_load_files()
+                if self.config[Config.BG_TRACKS_DIR]:
+                    self.on_bg_load_files()
         wx.CallAfter(init)
 
 # ------------------------------------------------------------------------------------------------------------------
@@ -400,6 +401,10 @@ class MainFrame(wx.Frame):
         self.proj_win.Destroy()
         self.proj_win = None
 
+    def on_bg_player_win_close(self, e):
+        self.bg_player.window.Destroy()
+        self.bg_player.window = None
+
     def proj_win_exists(self):
         return bool(self.proj_win)