Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16443/src/openvrml-xembed
Modified Files:
Tag: OpenVRML-0_16-BRANCH
main.cpp
Log Message:
Dismiss the error_guard when returning frommain prematurely (but without a GError).
Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** main.cpp 5 Feb 2007 04:41:53 -0000 1.1.2.1
--- main.cpp 5 Feb 2007 07:08:29 -0000 1.1.2.2
***************
*** 371,374 ****
--- 371,375 ----
if (version) {
cout << application_name << ' ' << PACKAGE_VERSION << endl;
+ error_guard.dismiss();
return EXIT_SUCCESS;
}
***************
*** 376,379 ****
--- 377,381 ----
if (!::args) {
cerr << argv[0] << ": missing required XID argument" << endl;
+ error_guard.dismiss();
return EXIT_FAILURE;
}
***************
*** 384,387 ****
--- 386,390 ----
} catch (const boost::bad_lexical_cast & ex) {
cerr << argv[0] << ": expected integer value for XID argument" << endl;
+ error_guard.dismiss();
return EXIT_FAILURE;
}
|
