From 445c8299e792c7ea18672491ed905ffd89eaea16 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 16 Mar 2019 22:54:05 +1100
Subject: [PATCH] fixed missing define and faulty clip selection logic

---
 dialogs/preferencesdialog.cpp | 2 ++
 timeline/sequence.cpp         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dialogs/preferencesdialog.cpp b/dialogs/preferencesdialog.cpp
index ebbd48e7e..4717dc7ae 100644
--- a/dialogs/preferencesdialog.cpp
+++ b/dialogs/preferencesdialog.cpp
@@ -260,7 +260,9 @@ void PreferencesDialog::save() {
   olive::CurrentConfig.language_file = language_combobox->currentData().toString();
 
   olive::CurrentConfig.style = static_cast<olive::styling::Style>(ui_style->currentData().toInt());
+#ifdef Q_OS_WIN
   olive::CurrentConfig.use_native_menu_styling = native_menus->isChecked();
+#endif
 
   // Check if the thumbnail or waveform icon
   if (olive::CurrentConfig.thumbnail_resolution != thumbnail_res_spinbox->value()
diff --git a/timeline/sequence.cpp b/timeline/sequence.cpp
index 5f3a69e71..da2e95bf7 100644
--- a/timeline/sequence.cpp
+++ b/timeline/sequence.cpp
@@ -165,7 +165,7 @@ bool Sequence::IsClipSelected(Clip *clip, bool containing)
 {
   for (int i=0;i<selections.size();i++) {
     const Selection& s = selections.at(i);
-    if (clip->track() == s.track && ((clip->timeline_in() >= s.in && clip->timeline_out() <= s.out && containing)
+    if (clip->track() == s.track && ((clip->timeline_in() >= s.in && clip->timeline_out() <= s.out)
                                   || (!containing && !(clip->timeline_in() < s.in && clip->timeline_out() < s.in)
                                    && !(clip->timeline_in() > s.in && clip->timeline_out() > s.in)))) {
       return true;