tarina

commit 80187b63129e12119c10eb0d7beb0c26e989f247
parent da2be84664900773a857573652c79bb780186a7c
Author: rbckman <rob@tarina.org>
Date:   Tue, 12 Sep 2023 14:59:12 +0100

delete scene from ports

Diffstat:
M
VERSION
 | 
2
+-
M
tarina.py
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-1.30
+1.31
 Kubrick
diff --git a/tarina.py b/tarina.py
@@ -702,7 +702,7 @@ def main():
                 #cleanupdisk(filmname,filmfolder)
             #REMOVE
             #take
-            elif pressed == 'remove' and menu[selected] == 'TAKE:' or pressed=='remove_now':
+            elif pressed == 'remove' and menu[selected] == 'TAKE:':
                 remove(filmfolder, filmname, scene, shot, take, 'take')
                 organize(filmfolder, filmname)
                 scenes, shots, takes = browse(filmname,filmfolder,scene,shot,take)
@@ -722,7 +722,7 @@ def main():
                 #loadfilmsettings = True
                 time.sleep(0.5)
             #scene
-            elif pressed == 'remove' and menu[selected] == 'SCENE:':
+            elif pressed == 'remove' and menu[selected] == 'SCENE:' or pressed=='remove_now':
                 remove(filmfolder, filmname, scene, shot, take, 'scene')
                 organize(filmfolder, filmname)
                 scenes, shots, takes = browse(filmname,filmfolder,scene,shot,take)