Revert "Show error when session-archive loading fails"
This reverts commit 48225c10bd
.
We need to allow this to fail and fall-through to test normal sessions.
This commit is contained in:
parent
9ee2a46b7a
commit
93121e8aa3
@ -182,7 +182,7 @@ ARDOUR_UI::session_dialog_response_handler (int response, SessionDialog* session
|
|||||||
if (!likely_new) {
|
if (!likely_new) {
|
||||||
int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name);
|
int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name);
|
||||||
|
|
||||||
if (rv != 0) {
|
if (rv < 0) {
|
||||||
ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
|
ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
|
||||||
msg.run ();
|
msg.run ();
|
||||||
return; /* back to main event loop */
|
return; /* back to main event loop */
|
||||||
|
@ -707,7 +707,7 @@ StartupFSM::check_session_parameters (bool must_be_new)
|
|||||||
/* See if the specified session is a session archive */
|
/* See if the specified session is a session archive */
|
||||||
|
|
||||||
int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name);
|
int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name);
|
||||||
if (rv != 0) {
|
if (rv < 0) {
|
||||||
ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
|
ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
|
||||||
msg.run ();
|
msg.run ();
|
||||||
return 1;
|
return 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user