Revision: 78069
http://sourceforge.net/p/brlcad/code/78069
Author: starseeker
Date: 2021-01-12 21:10:43 +0000 (Tue, 12 Jan 2021)
Log Message:
-----------
This needs to be done with a more informative dialog, if we're going to go this
route - revert r77990
Modified Paths:
--------------
brlcad/trunk/NEWS
brlcad/trunk/doc/docbook/system/mann/quit.xml
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/tclscripts/mged/mview.tcl
Modified: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS 2021-01-12 18:54:40 UTC (rev 78068)
+++ brlcad/trunk/NEWS 2021-01-12 21:10:43 UTC (rev 78069)
@@ -21,8 +21,6 @@
* fixed problems with command I/O management in MGED - Cliff Yapp
* added decimation control examples to facetize man page - Cliff Yapp
* changed gcv converter to append to existing .g files - Cliff Yapp
-* added a '-f' forcing option to MGED's quit command - Cliff Yapp
-* changed MGED's quit command to wait for subprocesses - Cliff Yapp
* removed obscure MGED menu entries for unused features - Cliff Yapp
* fixed crash when trying to shade invalid breps - Cliff Yapp
* changed 'mvall' to rename all refs even w/ no object - Sean Morrison
Modified: brlcad/trunk/doc/docbook/system/mann/quit.xml
===================================================================
--- brlcad/trunk/doc/docbook/system/mann/quit.xml 2021-01-12 18:54:40 UTC
(rev 78068)
+++ brlcad/trunk/doc/docbook/system/mann/quit.xml 2021-01-12 21:10:43 UTC
(rev 78069)
@@ -22,22 +22,12 @@
<refsection xml:id="description"><title>DESCRIPTION</title>
-<para>
- Ends the MGED process. Note that there is no write database
- command in MGED. All changes are made to the database as the
- user performs them. Therefore, a <command>quit</command>
- command will not restore the database to its pre-edited
- state. This is a synonym for the <command>q</command>
- command.
-</para>
+ <para>Ends the MGED process. Note that there is no write database
+ command in MGED. All changes are made to the database as the user
performs
+ them. Therefore, a <command>quit</command> command will not restore the
database to its pre-edited state.
+ This is a synonym for the <command>q</command> command.
-<para>
- By default, the quit command will not exit if there are
- active subprocess commands running. To exit regardless
- of those commands, add the <option>f</option> option to
- force quitting.
-</para>
-
+ </para>
</refsection>
<refsection xml:id="examples"><title>EXAMPLES</title>
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2021-01-12 18:54:40 UTC (rev 78068)
+++ brlcad/trunk/src/mged/cmd.c 2021-01-12 21:10:43 UTC (rev 78069)
@@ -1259,9 +1259,7 @@
int
f_quit(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, const
char *argv[])
{
- int force_quit = 0;
-
- if (argc < 1 || argc > 2) {
+ if (argc < 1 || 1 < argc) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
bu_vls_printf(&vls, "help %s", argv[0]);
@@ -1270,21 +1268,6 @@
return TCL_ERROR;
}
- if (argc > 1) {
- if (BU_STR_EQUAL(argv[1], "-f"))
- force_quit = 1;
- }
-
- /* Check if we have any ged subprocesses running. If we do, unless we're
forcing, don't
- * quite yet. */
- if (GEDP && BU_PTBL_LEN(&GEDP->ged_subp) && !force_quit) {
- struct bu_vls vls = BU_VLS_INIT_ZERO;
- bu_vls_sprintf(&vls, " attempting to quit while GED subprocesses are
running.\n\nTo list running processes, use the 'process list' command.\n\nTo
exit despite the running subprocesses, add the '-f' option to the quit
command.");
- Tcl_AppendResult(interpreter, bu_vls_cstr(&vls), (char *)NULL);
- bu_vls_free(&vls);
- return TCL_ERROR;
- }
-
if (STATE != ST_VIEW)
button(BE_REJECT);
Modified: brlcad/trunk/src/tclscripts/mged/mview.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/mview.tcl 2021-01-12 18:54:40 UTC (rev
78068)
+++ brlcad/trunk/src/tclscripts/mged/mview.tcl 2021-01-12 21:10:43 UTC (rev
78069)
@@ -249,7 +249,7 @@
# If all the windows are gone, we're closing the application
if { !$mged_gui($id,show_cmd) && !$mged_gui($id,show_dm)} {
- quit -f
+ exit
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
