Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 08:38:39 +02:00
Code Issues Releases Wiki Activity

Sequence consistency check will not throw in 2.2.1

Browse Source
This commit is contained in:
Paul Licameli 2017-11-20 20:27:31 -05:00
parent 2068662954
commit 6e72aed6a5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/InconsistencyException.h
View File

@ -45,6 +45,8 @@ public:
~InconsistencyException() override; ~InconsistencyException() override;
unsigned GetLine() const { return line; }
private: private:
std::unique_ptr< AudacityException > Move() override; std::unique_ptr< AudacityException > Move() override;

9
src/Sequence.cpp
View File

@ -1869,7 +1869,8 @@ void Sequence::ConsistencyCheck
if ( bError ) if ( bError )
{ {
wxLogError(wxT("*** Consistency check failed after %s. ***"), whereStr); wxLogError(wxT("*** Consistency check failed at %d after %s. ***"),
ex.GetLine(), whereStr);
wxString str; wxString str;
DebugPrintf(mBlock, mNumSamples, &str); DebugPrintf(mBlock, mNumSamples, &str);
wxLogError(wxT("%s"), str.c_str()); wxLogError(wxT("%s"), str.c_str());
@ -1877,9 +1878,9 @@ void Sequence::ConsistencyCheck
wxT("Recommended course of action:\n") wxT("Recommended course of action:\n")
wxT("Undo the failed operation(s), then export or save your work and quit.")); wxT("Undo the failed operation(s), then export or save your work and quit."));
if (mayThrow) //if (mayThrow)
throw ex; //throw ex;
else //else
wxASSERT(false); wxASSERT(false);
} }
} }