Improve closing of playist tabs

Fixes #90

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,14 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPep8Inspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="PyQt5.QtWidgets.customContextMenuRequested.*" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Poetry (musicmuster) (2)" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/musicmuster.iml" filepath="$PROJECT_DIR$/.idea/musicmuster.iml" />
+    </modules>
+  </component>
+</project>

.idea/musicmuster.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

app/musicmuster.py

@@ -222,21 +222,24 @@ class Window(QMainWindow, Ui_MainWindow):
         self.music.set_volume(volume)
 
     def close_playlist_tab(self):
-        with Session() as session:
+        self.close_tab(self.tabPlaylist.currentIndex())
-            playlist_db = session.query(Playlists).filter(
-                Playlists.id == self.visible_playlist_tab().id).one()
-            playlist_db.close(session)
-            index = self.tabPlaylist.currentIndex()
-            self.tabPlaylist.removeTab(index)
 
     def close_tab(self, index):
-        if self.tabPlaylist.widget(index) == self.current_track_playlist_tab:
+        if hasattr(self.tabPlaylist.widget(index), 'is_playlist'):
-            self.statusbar.showMessage("Can't close current track playlist",
+            if self.tabPlaylist.widget(index) == self.current_track_playlist_tab:
-                                       5000)
+                self.statusbar.showMessage("Can't close current track playlist",
-        elif self.tabPlaylist.widget(index) == self.next_track_playlist_tab:
+                                           5000)
-            self.statusbar.showMessage("Can't close next track playlist", 5000)
+                return
-        else:
+            if self.tabPlaylist.widget(index) == self.next_track_playlist_tab:
-            self.tabPlaylist.removeTab(index)
+                self.statusbar.showMessage("Can't close next track playlist", 5000)
+                return
+            # It's OK to close this playlist so remove from open playlist list
+            with Session() as session:
+                playlist_db = session.query(Playlists).filter(
+                    Playlists.id == self.visible_playlist_tab().id).one()
+                playlist_db.close(session)
+        # Close regardless of tab type
+        self.tabPlaylist.removeTab(index)
 
     def create_note(self, session, text):
         """

app/playlists.py

@@ -50,6 +50,7 @@ class PlaylistTab(QTableWidget):
 
         self.id = None
         self.name = None
+        self.is_playlist = True
         self.master_process = self.parent()
         self.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
         self.setAlternatingRowColors(True)