Author: kitone
Date: Fri Apr 17 21:02:54 2015
New Revision: 914
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=914&view=rev
Log:
Fix bug #20170 : Video/Timing
Modified:
trunk/ChangeLog
trunk/plugins/actions/timingfromplayer/dialog-timing-from-player-preferences.ui
trunk/plugins/actions/timingfromplayer/timingfromplayer.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=914&r1=913&r2=914&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Fri Apr 17 21:02:54 2015
@@ -1,3 +1,8 @@
+2015-04-17 kitone <[email protected]>
+
+ * plugins/actions/timingfromplayer/timingfromplayer.cc:
+ Fix bug #20170 : "Video"/"Timing from player" with an offset - only if
playing
+
2015-04-17 kitone <[email protected]>
* src/gui/application.cc:
Modified:
trunk/plugins/actions/timingfromplayer/dialog-timing-from-player-preferences.ui
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/timingfromplayer/dialog-timing-from-player-preferences.ui?rev=914&r1=913&r2=914&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/plugins/actions/timingfromplayer/timingfromplayer.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/timingfromplayer/timingfromplayer.cc?rev=914&r1=913&r2=914&view=diff
==============================================================================
--- trunk/plugins/actions/timingfromplayer/timingfromplayer.cc (original)
+++ trunk/plugins/actions/timingfromplayer/timingfromplayer.cc Fri Apr 17
21:02:54 2015
@@ -285,9 +285,12 @@
if(!sub)
return false;
- SubtitleTime pos =
get_subtitleeditor_window()->get_player()->get_position();
- // Apply offset coorection
- pos = pos - get_prefered_offset();
+ Player *player = get_subtitleeditor_window()->get_player();
+ SubtitleTime pos = player->get_position();
+ // Apply offset correction only if playing
+ if(player->get_state() == Player::PLAYING)
+ pos = pos - get_prefered_offset();
+
SubtitleTime dur = sub.get_duration();
// Start recording
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
