diff options
| author | in1tiate <radwoodward@vikings.grayson.edu> | 2021-02-13 07:36:57 -0600 |
|---|---|---|
| committer | in1tiate <radwoodward@vikings.grayson.edu> | 2021-02-13 07:36:57 -0600 |
| commit | 8163071d90514b2b57d1f67ff2cbae64f6535141 (patch) | |
| tree | bf1ef56eddb9d9009e2f01e404c5851aea581918 /src/aolayer.cpp | |
| parent | fe00c6b7defe10a2c63b690c04ae2779fcccf859 (diff) | |
if its the same file, dont interrupt playback
Diffstat (limited to 'src/aolayer.cpp')
| -rw-r--r-- | src/aolayer.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/aolayer.cpp b/src/aolayer.cpp index 9b1ab830..2fac58be 100644 --- a/src/aolayer.cpp +++ b/src/aolayer.cpp @@ -261,6 +261,15 @@ void CharLayer::start_playback(QString p_image) void AOLayer::start_playback(QString p_image) { + + if (!ao_app->is_continuous_enabled()) { + continuous = false; + force_continuous = true; + } + + if ((last_path == p_image) && (!force_continuous)) + return; + #ifdef DEBUG_MOVIE actual_time.restart(); #endif @@ -268,12 +277,6 @@ void AOLayer::start_playback(QString p_image) freeze(); movie_frames.clear(); movie_delays.clear(); - - if (!ao_app->is_continuous_enabled()) { - continuous = false; - force_continuous = true; - } - QString scaling_override = ao_app->read_design_ini("scaling", p_image + ".ini"); if (scaling_override != "") @@ -289,10 +292,6 @@ void AOLayer::start_playback(QString p_image) m_reader.setFileName(p_image); if (m_reader.loopCount() == 0) play_once = true; - if ((last_path == p_image) && (!force_continuous)) - continuous = true; - else if ((last_path != p_image) && !force_continuous) - continuous = false; if (!continuous) frame = 0; last_max_frames = max_frames; |
