# HG changeset patch
# User Chris Cannam
# Date 1525268021 -3600
# Node ID ec77ade1ab505b37fd2edcf9afbf6150c4624466
# Parent  8d44bfd19f49e7cd0e6d258ccdc715f492943c86# Parent  bea6e7bced2538bb1660e4700260e7c92c1b0eb7
Merge from default branch

diff -r 8d44bfd19f49 -r ec77ade1ab50 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed May 02 14:28:44 2018 +0100
+++ b/main/MainWindow.cpp	Wed May 02 14:33:41 2018 +0100
@@ -1611,6 +1611,7 @@
     set<LayerFactory::LayerType> seen;
     
     for (auto &a : m_paneActions) {
+        if (!a.second.sourceModel) continue; // empty pane/layer shortcut
         auto type = a.second.layer;
         if (a.second.sourceModel == model && seen.find(type) == seen.end()) {
             a.first->setShortcut(shortcutFor(type, true));
@@ -1623,6 +1624,7 @@
     seen.clear();
     
     for (auto &a : m_layerActions) {
+        if (!a.second.sourceModel) continue; // empty pane/layer shortcut
         auto type = a.second.layer;
         if (a.second.sourceModel == model && seen.find(type) == seen.end()) {
             a.first->setShortcut(shortcutFor(type, false));
diff -r 8d44bfd19f49 -r ec77ade1ab50 sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Wed May 02 14:28:44 2018 +0100
+++ b/sonic-visualiser.qrc	Wed May 02 14:33:41 2018 +0100
@@ -42,6 +42,7 @@
     <file>icons/scalable/rewind-start.svg</file>
     <file>icons/scalable/rewind.svg</file>
     <file>icons/scalable/select.svg</file>
+    <file>icons/scalable/show-peaks.svg</file>
     <file>icons/scalable/solo.svg</file>
     <file>icons/scalable/speaker.svg</file>
     <file>icons/scalable/spectrogram.svg</file>
@@ -77,7 +78,6 @@
     <file>icons/sharpen.png</file>
     <file>icons/emptypage.png</file>
     <file>icons/invert-vertical.png</file>
-    <file>icons/show-peaks.png</file>
     <file>icons/opaque.png</file>
     <file>icons/smooth.png</file>
     <file>icons/lines.png</file>
diff -r 8d44bfd19f49 -r ec77ade1ab50 vext-lock.json
--- a/vext-lock.json	Wed May 02 14:28:44 2018 +0100
+++ b/vext-lock.json	Wed May 02 14:33:41 2018 +0100
@@ -40,7 +40,7 @@
       "pin": "a69c1527268d"
     },
     "icons/scalable": {
-      "pin": "4b0d76640524"
+      "pin": "a0a78163e88e"
     }
   }
 }