From 462ab5aa3728fe97a929317d1b76967ebf297a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 24 Nov 2016 11:28:45 +0100
Subject: [PATCH] Prevent SWU popup when wizard is open

---
 .../plugins/softwareupdate/static/js/softwareupdate.js     | 2 +-
 src/octoprint/static/js/app/main.js                        | 4 +++-
 src/octoprint/static/js/app/viewmodels/settings.js         | 2 ++
 src/octoprint/static/js/app/viewmodels/wizard.js           | 7 +++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
index 24d8bdd7..4be6240f 100644
--- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
+++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
@@ -335,7 +335,7 @@ $(function() {
                     };
                 }
 
-                if (ignoreSeen || !self._hasNotificationBeenSeen(data.information)) {
+                if ((ignoreSeen || !self._hasNotificationBeenSeen(data.information)) && !OctoPrint.coreui.wizardOpen) {
                     self._showPopup(options, eventListeners);
                 }
             } else if (data.status == "current") {
diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index 127643b5..86221ca4 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -36,7 +36,9 @@ $(function() {
         OctoPrint.coreui = (function() {
             var exports = {
                 browserTabVisibility: undefined,
-                selectedTab: undefined
+                selectedTab: undefined,
+                settingsOpen: false,
+                wizardOpen: false
             };
 
             var browserVisibilityCallbacks = [];
diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index 102a9a90..43482ee1 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -360,12 +360,14 @@ $(function() {
             self.allViewModels = allViewModels;
 
             self.settingsDialog.on('show', function(event) {
+                OctoPrint.coreui.settingsOpen = true;
                 if (event.target.id == "settings_dialog") {
                     self.requestTranslationData();
                     callViewModels(allViewModels, "onSettingsShown");
                 }
             });
             self.settingsDialog.on('hidden', function(event) {
+                OctoPrint.coreui.settingsOpen = false;
                 if (event.target.id == "settings_dialog") {
                     callViewModels(allViewModels, "onSettingsHidden");
                 }
diff --git a/src/octoprint/static/js/app/viewmodels/wizard.js b/src/octoprint/static/js/app/viewmodels/wizard.js
index 4f460989..5bdccede 100644
--- a/src/octoprint/static/js/app/viewmodels/wizard.js
+++ b/src/octoprint/static/js/app/viewmodels/wizard.js
@@ -43,6 +43,13 @@ $(function() {
 
         self.onStartup = function() {
             self.wizardDialog = $("#wizard_dialog");
+            self.wizardDialog.on('show', function(event) {
+                OctoPrint.coreui.wizardOpen = true;
+            });
+            self.wizardDialog.on('hidden', function(event) {
+                OctoPrint.coreui.wizardOpen = false;
+            });
+
             self.reloadOverlay = $("#reloadui_overlay");
         };