Merged revision(s) 21721 from trunk/OpenMPT:

[Fix] openmpt123: Catch openmpt123::exception. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21722 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Sep 23, 2024 · 86ba3f8 · 86ba3f8
1 parent afaeda2
commit 86ba3f8
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/openmpt123/openmpt123.cpp b/openmpt123/openmpt123.cpp
@@ -2301,6 +2301,10 @@ static int main( int argc, char * argv [] ) {
 		return 0;
 	} catch ( silent_exit_exception & ) {
 		return 0;
+	} catch ( exception & e ) {
+		std_err << MPT_USTRING("error: ") << mpt::get_exception_text<mpt::ustring>( e ) << lf;
+		std_err.writeout();
+		return 1;
 	} catch ( std::exception & e ) {
 		std_err << MPT_USTRING("error: ") << mpt::get_exception_text<mpt::ustring>( e ) << lf;
 		std_err.writeout();
@@ -2468,6 +2472,10 @@ static int main( int argc, char * argv [] ) {
 #endif
 	} catch ( silent_exit_exception & ) {
 		return 0;
+	} catch ( exception & e ) {
+		std_err << MPT_USTRING("error: ") << mpt::get_exception_text<mpt::ustring>( e ) << lf;
+		std_err.writeout();
+		return 1;
 	} catch ( std::exception & e ) {
 		std_err << MPT_USTRING("error: ") << mpt::get_exception_text<mpt::ustring>( e ) << lf;
 		std_err.writeout();