From ac2820cd74f04bac424a6780b5b23ee065349804 Mon Sep 17 00:00:00 2001
From: Jared Bruni <jaredbruni@gmail.com>
Date: Wed, 2 Mar 2022 20:19:05 -0800
Subject: [PATCH] Cross fade disabled by default now

---
 src/main_window.cpp     |  2 +-
 src/playback_thread.cpp | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main_window.cpp b/src/main_window.cpp
index 85666f1..cb0eb4b 100644
--- a/src/main_window.cpp
+++ b/src/main_window.cpp
@@ -480,7 +480,7 @@ void AC_MainWindow::createMenu() {
     
     fade_on = new QAction(tr("Cross Fade"), this);
     fade_on->setCheckable(true);
-    fade_on->setChecked(true);
+    fade_on->setChecked(false);
     options->addAction(fade_on);
     options->addAction(repeat_v);
     options->addAction(cycle_custom);
diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp
index 4d9bfd1..6c0ef82 100644
--- a/src/playback_thread.cpp
+++ b/src/playback_thread.cpp
@@ -19,7 +19,7 @@ Playback::Playback(QObject *parent) : QThread(parent) {
     flip_frame1 = false;
     flip_frame2 = false;
     repeat_video = false;
-    fadefilter = true;
+    fadefilter = false;
     cycle_on = 0;
     cycle_index = 0;
     frame_num = 0;
@@ -295,8 +295,9 @@ void Playback::setIndexChanged(std::string value) {
     current_filter = filter_map_ex[value];
     // here:
     //ac::release_all_objects();
-    mutex.unlock();
     alpha = 1.0;
+    mutex.unlock();
+    
 }
 
 void Playback::setSingleMode(bool val) {
@@ -410,7 +411,7 @@ void Playback::run() {
         static std::vector<FilterValue> cur;
         cur = current;
         ac::orig_frame = frame.clone();
-        FilterValue current_filterx = current_filter, prev_filterx = prev_filter;
+        FilterValue current_filterxv = current_filter, prev_filterx = prev_filter;
         std::string png_pathx = png_path;
         if(blend_image_copy_set) {
             blend_image = blend_image_copy.clone();
@@ -475,13 +476,13 @@ void Playback::run() {
         }
         
         if(single_mode == true && alpha > 0) {
-            if(fadefilter == true) filterFade(frame, current_filterx, prev_filterx, alpha);
+            if(fadefilter == true) filterFade(frame, current_filterxv, prev_filterx, alpha);
             drawEffects(frame);
             alpha = alpha-0.08;
         } else if(single_mode == true) {
             ac::setSubFilter(-1);
             ac::in_custom = false;
-            drawFilter(frame, current_filterx);
+            drawFilter(frame, current_filterxv);
             drawEffects(frame);
             msleep(duration);
         } else if(cur.size()>0) {