Merge pull request #4238 from OpenShot/fix-export-glitch

Fix race condition on Export dialog, which would create random glitch at beginning of export

Author: jonoomph

src/windows/export.py

@@ -94,14 +94,6 @@ def __init__(self, *args, **kwargs):
         self.close_button.setVisible(False)
         self.exporting = False
 
-        # Update FPS / Profile timer
-        # Timer to use a delay before applying new profile/fps data (so we don't spam libopenshot)
-        self.delayed_fps_timer = None
-        self.delayed_fps_timer = QTimer()
-        self.delayed_fps_timer.setInterval(200)
-        self.delayed_fps_timer.setSingleShot(True)
-        self.delayed_fps_timer.timeout.connect(self.delayed_fps_callback)
-
         # Pause playback (to prevent crash since we are fixing to change the timeline's max size)
         get_app().window.actionPlay_trigger(None, force="pause")
 
@@ -279,19 +271,6 @@ def __init__(self, *args, **kwargs):
         # Determine the length of the timeline (in frames)
         self.updateFrameRate()
 
-    def delayed_fps_callback(self):
-        """Callback for fps/profile changed event timer
-        (to delay the timeline mapping so we don't spam libopenshot)"""
-        # Calculate fps
-        fps_double = self.timeline.info.fps.ToDouble()
-
-        # Apply mapping if valid fps detected (anything larger than 300 fps is considered invalid)
-        if self.timeline and fps_double <= 300.0:
-            log.info("Valid framerate detected, sending to libopenshot: %s" % fps_double)
-            self.timeline.ApplyMapperToClips()
-        else:
-            log.warning("Invalid framerate detected, not sending it to libopenshot: %s" % fps_double)
-
     def getProfilePath(self, profile_name):
         """Get the profile path that matches the name"""
         for profile, path in self.profile_paths.items():
@@ -346,10 +325,6 @@ def updateFrameRate(self):
         self.timeline.info.channels = self.txtChannels.value()
         self.timeline.info.channel_layout = self.cboChannelLayout.currentData()
 
-        # Send changes to libopenshot (apply mappings to all framemappers)
-        # Start or restart timer to process changes after a small delay
-        self.delayed_fps_timer.start()
-
         # Determine max frame (based on clips)
         self.timeline_length_int = self.timeline.GetMaxFrame()
 
@@ -836,6 +811,7 @@ def titlestring(sec, fps, mess):
 
             # Re-update the timeline FPS again (since the timeline just got clobbered)
             self.updateFrameRate()
+            self.timeline.ApplyMapperToClips()
 
         # Create FFmpegWriter
         try: