Merged revision(s) 21721 from trunk/OpenMPT:

[Fix] openmpt123: Catch openmpt123::exception.
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@21723 56274372-70c3-4bfc-bfc3-4c3a0b034d27

openmpt123/openmpt123.cpp

@@ -2358,6 +2358,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 << "error: " << e.what() << std::endl;
 		std_err.writeout();
@@ -2522,6 +2526,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 << "error: " << e.what() << std::endl;
 		std_err.writeout();