Revision: 76645
http://sourceforge.net/p/brlcad/code/76645
Author: starseeker
Date: 2020-08-02 19:53:00 +0000 (Sun, 02 Aug 2020)
Log Message:
-----------
Merge from trunk through r76644
Modified Paths:
--------------
brlcad/branches/RELEASE/src/libtclcad/tclcad_obj.c
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-02 19:51:14 UTC (rev 76644)
+++ brlcad/branches/RELEASE 2020-08-02 19:53:00 UTC (rev 76645)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76644
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/RELEASE/src/libtclcad/tclcad_obj.c 2020-08-02 19:51:14 UTC
(rev 76644)
+++ brlcad/branches/RELEASE/src/libtclcad/tclcad_obj.c 2020-08-02 19:53:00 UTC
(rev 76645)
@@ -1163,9 +1163,10 @@
int *fdp;
if (!p) return;
fdp = (int *)bu_process_fd(p, fd);
- if (fdp)
+ if (fdp) {
Tcl_DeleteFileHandler(*fdp);
- close(*fdp);
+ close(*fdp);
+ }
}
#else
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
