From 320e0c02a490cf49d42f5def9c1bf0223f228aa2 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Mon, 20 May 2019 15:21:38 -0400
Subject: [PATCH] confirmation before github pull

---
 index.html |  1 +
 src/ui.ts  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 72fcd703..4057963d 100644
--- a/index.html
+++ b/index.html
@@ -353,6 +353,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
         <p>Enter the GitHub repository URL:</p>
         <p><input id="importGithubURL" size="60" placeholder="https://github.com/user/repo"></input></p>
         <p>If the project is compatible with 8bitworkshop, it should build automatically.</p>
+        <p>Source files must be in the root folder of the repository.</p>
         <p><button type="button" class="btn btn-primary" id="importGithubButton">Import Project</button></p>
       </div>
       <div class="modal-footer">
diff --git a/src/ui.ts b/src/ui.ts
index f4c3d8f3..746e0613 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -77,9 +77,11 @@ var TOOL_TO_SOURCE_STYLE = {
 
 function alertError(s:string) {
   if (ga) ga('send', 'event', 'error', 'error', s);
+  setWaitDialog(false);
   bootbox.alert(s);
 }
 function alertInfo(s:string) {
+  setWaitDialog(false);
   bootbox.alert(s);
 }
 
@@ -518,10 +520,14 @@ function _pushProjectToGithub(e) {
 function _pullProjectFromGithub(e) {
   var ghurl = getBoundGithubURL();
   if (!ghurl) return;
-  setWaitDialog(true);
-  getGithubService().pull(ghurl).then( (sess:GHSession) => {
-    setWaitDialog(false);
-    projectWindows.updateAllOpenWindows(store);
+  bootbox.confirm("Pull from repository and replace all local files?", (ok) => {
+    if (ok) {
+      setWaitDialog(true);
+      getGithubService().pull(ghurl).then( (sess:GHSession) => {
+        setWaitDialog(false);
+        projectWindows.updateAllOpenWindows(store);
+      });
+    }
   });
 }