comparison src/Analyser.cpp @ 252:f99fae5fe89c

Fix accidental nesting of compound commands which broke "Abandon Selection" logic; move note-snap after editing into the compound command for the edit function instead of issuing a separate command

 QString
 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range)
 {
     if (sel == m_reAnalysingSelection || sel.isEmpty()) return "";
 
-    discardPitchCandidates();
+    if (!m_reAnalysisCandidates.empty()) {
+        CommandHistory::getInstance()->startCompoundOperation
+            (tr("Discard Previous Candidates"), true);
+        discardPitchCandidates();
+        CommandHistory::getInstance()->endCompoundOperation();
+    }
 
     m_reAnalysingSelection = sel;
 
     m_preAnalysis = Clipboard();
     Layer *myLayer = m_layers[PitchTrack];

 }
 
 void
 Analyser::abandonReAnalysis(Selection sel)
 {
+    // A compound command is already in progress
+
     discardPitchCandidates();
 
     Layer *myLayer = m_layers[PitchTrack];
     if (!myLayer) return;
     myLayer->deleteSelection(sel);

 
 void
 Analyser::discardPitchCandidates()
 {
     if (!m_reAnalysisCandidates.empty()) {
-
-        CommandHistory::getInstance()->startCompoundOperation
-            (tr("Discard Previous Candidates"), true);
-
+        // We don't use a compound command here, because we may be
+        // already in one. Caller bears responsibility for doing that
         foreach (Layer *layer, m_reAnalysisCandidates) {
             // This will cause the layer to be deleted later (ownership is
             // transferred to the remove command)
             m_document->removeLayerFromView(m_pane, layer);
         }
-
         m_reAnalysisCandidates.clear();
-        CommandHistory::getInstance()->endCompoundOperation();
     }
 
     m_currentCandidate = -1;
     m_reAnalysingSelection = Selection();
     m_candidatesVisible = false;