From a24b90c99ec5f698ca7dd7aefc94c774174fa856 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 26 Feb 2019 11:19:23 -0800
Subject: [PATCH] corrected some viewer behavior when pressing play after the
 end of a sequence

---
 mainwindow.cpp    |  3 +++
 panels/viewer.cpp | 11 ++++++-----
 ui/menuhelper.cpp |  6 ++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5bc233751..967bdc3b9 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -343,9 +343,12 @@ void MainWindow::editMenu_About_To_Be_Shown() {
 
 void MainWindow::setup_menus() {
   QMenuBar* menuBar = new QMenuBar(this);
+
+  /*
   menuBar->setStyle(QStyleFactory::create("windowsvista"));
   menuBar->setPalette(menuBar->style()->standardPalette());
   menuBar->setStyleSheet("");
+  */
 
   setMenuBar(menuBar);
 
diff --git a/panels/viewer.cpp b/panels/viewer.cpp
index 5a5203cb2..7d2129095 100644
--- a/panels/viewer.cpp
+++ b/panels/viewer.cpp
@@ -390,24 +390,25 @@ void Viewer::play(bool in_to_out) {
       uncue_recording();
     }
 
-    if (playback_speed == 0) {
-      playback_speed = 1;
-    }
-
     bool seek_to_in = (seq->using_workarea && (olive::CurrentConfig.loop || playing_in_to_out));
     if (!is_recording_cued()
-        && playback_speed > 0
+        && playback_speed >= 0
         && (playing_in_to_out
             || seq->playhead >= sequence_end_frame
             || (seek_to_in && seq->playhead >= seq->workarea_out))) {
       seek(seek_to_in ? seq->workarea_in : 0);
     }
 
+    if (playback_speed == 0) {
+      playback_speed = 1;
+    }
+
     reset_all_audio();
     if (is_recording_cued() && !start_recording()) {
       qCritical() << "Failed to record audio";
       return;
     }
+
     playhead_start = seq->playhead;
     playing = true;
     just_played_ = true;
diff --git a/ui/menuhelper.cpp b/ui/menuhelper.cpp
index d65a77f3a..6cb2ed788 100644
--- a/ui/menuhelper.cpp
+++ b/ui/menuhelper.cpp
@@ -266,9 +266,12 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
                                   const QObject *receiver,
                                   const char *member) {
   QMenu* menu = new QMenu(parent);
+
+  /*
   menu->setStyle(QStyleFactory::create("windowsvista"));
   menu->setPalette(menu->style()->standardPalette());
   menu->setStyleSheet("");
+  */
 
   parent->addMenu(menu);
 
@@ -281,9 +284,12 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
 
 QMenu* MenuHelper::create_submenu(QMenu* parent) {
   QMenu* menu = new QMenu(parent);
+
+  /*
   menu->setStyle(QStyleFactory::create("windowsvista"));
   menu->setPalette(menu->style()->standardPalette());
   menu->setStyleSheet("");
+  */
 
   parent->addMenu(menu);
   return menu;