Merge pull request #3700 from ferdnyc/add-track-fix

Fix "Add track" action (toolbar icon, keyboard shortcut)

Author: ferdnyc

src/classes/logger_libopenshot.py

@@ -34,6 +34,9 @@
 
 
 class LoggerLibOpenShot(Thread):
+    def __init__(self):
+        super().__init__()
+        self.daemon = True
 
     def kill(self):
         self.running = False
@@ -80,4 +83,4 @@ def run(self):
 
             # Log the message (if any)
             if msg:
-                log.info(msg.strip().decode('UTF-8'))
+                log.info(msg.strip().decode('UTF-8'))

src/classes/metrics.py

@@ -99,6 +99,7 @@ def track_metric_screen(screen_name):
     metric_params["cid"] = s.get("unique_install_id")
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 
@@ -113,6 +114,7 @@ def track_metric_event(event_action, event_label, event_category="General", even
     metric_params["cid"] = s.get("unique_install_id")
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 
@@ -126,12 +128,14 @@ def track_metric_error(error_name, is_fatal=False):
         metric_params["exf"] = 1
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 
 def track_exception_stacktrace(stacktrace, source):
     """Track an exception/stacktrace has occurred"""
     t = threading.Thread(target=send_exception, args=[stacktrace, source])
+    t.daemon = True
     t.start()
 
 
@@ -147,6 +151,7 @@ def track_metric_session(is_start=True):
         metric_params["cd"] = "close-app"
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 

src/classes/thumbnail.py

@@ -106,10 +106,12 @@ def run(self):
         # Start listening for HTTP requests (and check for shutdown every 0.5 seconds)
         self.server_address = ('127.0.0.1', self.find_free_port())
         self.thumbServer = httpThumbnailServer(self.server_address, httpThumbnailHandler)
+        self.thumbServer.daemon_threads = True
         self.thumbServer.serve_forever(0.5)
 
     def __init__(self):
         Thread.__init__(self)
+        self.daemon = True
         self.server_address = None
 
 

src/classes/version.py

@@ -35,6 +35,7 @@
 def get_current_Version():
     """Get the current version """
     t = threading.Thread(target=get_version_from_http)
+    t.daemon = True
     t.start()
 
 def get_version_from_http():

src/classes/waveform.py

@@ -49,6 +49,7 @@ def get_audio_data(clip_id, file_path, channel_filter, volume_keyframe):
 
     log.info("Clip loaded, start thread")
     t = threading.Thread(target=get_waveform_thread, args=[clip, clip_id, file_path, channel_filter, volume_keyframe])
+    t.daemon = True
     t.start()
 
 def get_waveform_thread(clip, clip_id, file_path, channel_filter=-1, volume_keyframe=None):

src/timeline/js/controllers.js

@@ -943,7 +943,7 @@ App.controller("TimelineCtrl", function ($scope) {
 
         // Find element on screen (bound to this layer)
         var layer_elem = $("#track_" + layer.number);
-        if (layer_elem) {
+        if (layer_elem.offset()) {
           // Update the top offset
           layer.y = layer_elem.offset().top + vert_scroll_offset;
         }

src/windows/animated_title.py

@@ -31,7 +31,6 @@
 import time
 import uuid
 import shutil
-import threading
 import subprocess
 import re
 import math

src/windows/main_window.py

@@ -1190,7 +1190,8 @@ def actionAddTrack_trigger(self, event):
 
         # Get # of tracks
         all_tracks = get_app().project.get("layers")
-        track_number = reversed(sorted(all_tracks, key=lambda x: x['number']))[0].get("number") + 1000000
+        all_tracks.sort(key=lambda x: x['number'], reverse=True)
+        track_number = all_tracks[0].get("number") + 1000000
 
         # Create new track above existing layer(s)
         track = Track()

src/windows/preview_thread.py

@@ -25,7 +25,6 @@
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """
 
-import os
 import time
 import sip
 
@@ -35,9 +34,7 @@
 
 from classes.app import get_app
 from classes.logger import log
-from classes import settings
 
-import json
 
 class PreviewParent(QObject):
     """ Class which communicates with the PlayerWorker Class (running on a separate thread) """
@@ -226,7 +223,6 @@ def LoadFile(self, path=None):
             return
 
         log.info("LoadFile %s" % path)
-        s = settings.get_settings()
 
         # Determine the current frame of the timeline (when switching to a clip)
         seek_position = 1
@@ -248,7 +244,6 @@ def LoadFile(self, path=None):
             seek_position = self.original_position
         else:
             # Create new timeline reader (to preview selected clip)
-            s = settings.get_settings()
             project = get_app().project
 
             # Get some settings from the project