# HG changeset patch
# User Chris Cannam
# Date 1539339309 -3600
# Node ID 214ee4c2bc61ddde1bccf5f866861fd2b3c607a2
# Parent  d5296c91a0ffb15a0d7858290b107d8f914b2ead# Parent  337d16097516b32599ecc0c06d851c4825e847b2
Merge

diff -r 337d16097516 -r 214ee4c2bc61 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Tue Oct 09 16:02:04 2018 +0100
+++ b/main/MainWindow.cpp	Fri Oct 12 11:15:09 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 214ee4c2bc61 repoint-lock.json
--- a/repoint-lock.json	Tue Oct 09 16:02:04 2018 +0100
+++ b/repoint-lock.json	Fri Oct 12 11:15:09 2018 +0100
@@ -7,7 +7,7 @@
       "pin": "2fec0d9bd7ac"
     },
     "svgui": {
-      "pin": "4949061fcb8c"
+      "pin": "e848ea0850fe"
     },
     "svapp": {
       "pin": "7eafe977a1fc"
diff -r 337d16097516 -r 214ee4c2bc61 sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Tue Oct 09 16:02:04 2018 +0100
+++ b/sonic-visualiser.qrc	Fri Oct 12 11:15:09 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>