RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent reentrant locks

This commit is contained in:
David Rose 2006-01-24 17:26:39 +00:00
parent 7f35c53ae5
commit 318b9e520a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panda/src/display/displayRegion.cxx
View File

@ -197,9 +197,8 @@ set_dimensions(float l, float r, float b, float t) {
_b = b;
_t = t;
const GraphicsOutput *win = get_window();
if (win != (GraphicsOutput *)NULL && win->has_size()) {
do_compute_pixels(win->get_x_size(), win->get_y_size());
if (_window != (GraphicsOutput *)NULL && _window->has_size()) {
do_compute_pixels(_window->get_x_size(), _window->get_y_size());
}
}
@ -319,11 +318,9 @@ set_sort(int sort) {
////////////////////////////////////////////////////////////////////
void DisplayRegion::
compute_pixels() {
const GraphicsOutput *win = get_window();
if (win != (GraphicsOutput *)NULL) {
MutexHolder holder(_lock);
do_compute_pixels(win->get_x_size(), win->get_y_size());
MutexHolder holder(_lock);
if (_window != (GraphicsOutput *)NULL) {
do_compute_pixels(_window->get_x_size(), _window->get_y_size());
}
}