# HG changeset patch
# User Chris Cannam
# Date 1539158300 -3600
# Node ID 4db75d584e5a76e385f219e900523d25ada5c89b
# Parent  d70122abd746b60d92bdabb28ddf95ea3d4a37bd# Parent  337d16097516b32599ecc0c06d851c4825e847b2
Merge from branch zoom

diff -r 337d16097516 -r 4db75d584e5a main/MainWindow.cpp
--- a/main/MainWindow.cpp	Tue Oct 09 16:02:04 2018 +0100
+++ b/main/MainWindow.cpp	Wed Oct 10 08:58:20 2018 +0100
@@ -3580,16 +3580,16 @@
 void
 MainWindow::closeEvent(QCloseEvent *e)
 {
-//    cerr << "MainWindow::closeEvent" << endl;
+    SVDEBUG << "MainWindow::closeEvent" << endl;
 
     if (m_openingAudioFile) {
-//        cerr << "Busy - ignoring close event" << endl;
+        SVCERR << "Busy - ignoring close event" << endl;
         e->ignore();
         return;
     }
 
     if (!m_abandoning && !checkSaveModified()) {
-//        cerr << "Close refused by user - ignoring close event" << endl;
+        SVCERR << "Close refused by user - ignoring close event" << endl;
         e->ignore();
         return;
     }
diff -r 337d16097516 -r 4db75d584e5a repoint-lock.json
--- a/repoint-lock.json	Tue Oct 09 16:02:04 2018 +0100
+++ b/repoint-lock.json	Wed Oct 10 08:58:20 2018 +0100
@@ -4,13 +4,13 @@
       "pin": "da86fb0bccb3"
     },
     "svcore": {
-      "pin": "2fec0d9bd7ac"
+      "pin": "4de4284d0596"
     },
     "svgui": {
-      "pin": "4949061fcb8c"
+      "pin": "86429ff00f05"
     },
     "svapp": {
-      "pin": "7eafe977a1fc"
+      "pin": "b936872faff2"
     },
     "checker": {
       "pin": "51a8fe0a03cf"
diff -r 337d16097516 -r 4db75d584e5a repoint-project.json
--- a/repoint-project.json	Tue Oct 09 16:02:04 2018 +0100
+++ b/repoint-project.json	Wed Oct 10 08:58:20 2018 +0100
@@ -16,18 +16,15 @@
         },
         "svcore": {
             "vcs": "hg",
-            "service": "soundsoftware",
-	    "branch": "zoom"
+            "service": "soundsoftware"
         },
         "svgui": {
             "vcs": "hg",
-            "service": "soundsoftware",
-	    "branch": "zoom"
+            "service": "soundsoftware"
         },
         "svapp": {
             "vcs": "hg",
-	    "service": "soundsoftware",
-	    "branch": "zoom"
+	    "service": "soundsoftware"
         },
         "checker": {
             "vcs": "hg",
diff -r 337d16097516 -r 4db75d584e5a sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Tue Oct 09 16:02:04 2018 +0100
+++ b/sonic-visualiser.qrc	Wed Oct 10 08:58:20 2018 +0100
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
   <qresource>
     <file>icons/scalable/align.svg</file>
+    <file>icons/scalable/cancel.svg</file>
     <file>icons/scalable/colour3d.svg</file>
     <file>icons/scalable/cross.svg</file>
     <file>icons/scalable/datadelete.svg</file>