From ac4fd70dc2ac0627546f2e8e84d202637b849229 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 31 Dec 2018 01:23:20 +1100
Subject: [PATCH] fixed nesting bug and reveal in project with icon view bug

---
 mainwindow.cpp        | 3 +++
 panels/project.cpp    | 1 +
 ui/timelinewidget.cpp | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 56880c2f9..f84212d13 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1200,6 +1200,9 @@ void MainWindow::nest() {
 			panel_timeline->create_ghosts_from_media(sequence, earliest_point, media_list);
 			panel_timeline->add_clips_from_ghosts(ca, sequence);
 
+			panel_effect_controls->clear_effects(true);
+			sequence->selections.clear();
+
 			undo_stack.push(ca);
 
 			update_ui(true);
diff --git a/panels/project.cpp b/panels/project.cpp
index 1ce310977..96640180b 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -729,6 +729,7 @@ bool Project::reveal_media(Media *media, QModelIndex parent) {
 				tree_view->selectionModel()->select(sorted_index, QItemSelectionModel::Select);
 			} else if (config.project_view_type == PROJECT_VIEW_ICON) {
 				icon_view->setRootIndex(hierarchy);
+				icon_view->selectionModel()->select(sorted_index, QItemSelectionModel::Select);
 				set_up_dir_enabled();
 			}
 
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index 507a97530..7e9e901e6 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -155,7 +155,7 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
 			connect(nestAction, SIGNAL(triggered(bool)), mainWindow, SLOT(nest()));
 
 			// stabilizer option
-			int video_clip_count = 0;
+			/*int video_clip_count = 0;
 			bool all_video_is_footage = true;
 			for (int i=0;i<selected_clips.size();i++) {
 				if (selected_clips.at(i)->track < 0) {
@@ -169,7 +169,7 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
 			if (video_clip_count == 1 && all_video_is_footage) {
 				QAction* stabilizerAction = menu.addAction("S&tabilizer");
 				connect(stabilizerAction, SIGNAL(triggered(bool)), this, SLOT(show_stabilizer_diag()));
-			}
+			}*/
 
 			// set autoscale arbitrarily to the first selected clip
 			autoscaleAction->setChecked(selected_clips.at(0)->autoscale);