mirror of
https://github.com/cookiengineer/audacity
synced 2025-09-17 08:40:27 +02:00
Avoid long repetitions of message boxes for opening corrupt project
This commit is contained in:
parent
404eca84c8
commit
e4b9b7b505
@ -13,7 +13,11 @@ wxAtomicInt sOutstandingMessages {};
|
||||
MessageBoxException::MessageBoxException( const wxString &caption_ )
|
||||
: caption{ caption_ }
|
||||
{
|
||||
wxAtomicInc( sOutstandingMessages );
|
||||
if (!caption.empty())
|
||||
wxAtomicInc( sOutstandingMessages );
|
||||
else
|
||||
// invalidate me
|
||||
moved = true;
|
||||
}
|
||||
|
||||
// The class needs a copy constructor to be throwable
|
||||
|
@ -55,6 +55,7 @@ class MessageBoxException /* not final */ : public AudacityException
|
||||
void DelayedHandlerAction() override;
|
||||
|
||||
protected:
|
||||
// If default-constructed with empty caption, it makes no message box.
|
||||
explicit MessageBoxException( const wxString &caption = wxString{} );
|
||||
~MessageBoxException() override;
|
||||
|
||||
@ -74,7 +75,7 @@ class SimpleMessageBoxException /* not final */ : public MessageBoxException
|
||||
{
|
||||
public:
|
||||
explicit SimpleMessageBoxException( const wxString &message_,
|
||||
const wxString &caption = wxString{} )
|
||||
const wxString &caption = _("Message") )
|
||||
: MessageBoxException{ caption }
|
||||
, message{ message_ }
|
||||
{}
|
||||
|
@ -19,7 +19,7 @@ public:
|
||||
|
||||
explicit FileException
|
||||
( Cause cause_, const wxFileName &fileName_,
|
||||
const wxString &caption = wxString{},
|
||||
const wxString &caption = _("File Error"),
|
||||
const wxFileName &renameTarget_ = {})
|
||||
: MessageBoxException{ caption }
|
||||
, cause{ cause_ }, fileName{ fileName_ }, renameTarget{ renameTarget_ }
|
||||
|
@ -22,7 +22,8 @@ public:
|
||||
|
||||
explicit InconsistencyException
|
||||
( const char *fn, const char *f, unsigned l )
|
||||
: func { fn }, file { f }, line { l }
|
||||
: MessageBoxException{ _("Internal Error") }
|
||||
, func { fn }, file { f }, line { l }
|
||||
{}
|
||||
|
||||
InconsistencyException(InconsistencyException&& that)
|
||||
|
Loading…
x
Reference in New Issue
Block a user