Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 05:23:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5290 from BingShearer/CrashFixes

Browse source 
Crash fixes
This commit is contained in:
Andrew Meadows 2015-07-10 10:42:47 -07:00
commit 1759f0553d
2 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/DatagramProcessor.cpp
View file

@ -29,12 +29,13 @@ DatagramProcessor::DatagramProcessor(QObject* parent) :
} }
void DatagramProcessor::processDatagrams() { void DatagramProcessor::processDatagrams() {
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
"DatagramProcessor::processDatagrams()");
if (_isShuttingDown) { if (_isShuttingDown) {
return; // bail early... we're shutting down. return; // bail early... we're shutting down.
} }
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
"DatagramProcessor::processDatagrams()");
HifiSockAddr senderSockAddr; HifiSockAddr senderSockAddr;

14
interface/src/ui/overlays/ImageOverlay.cpp
View file

@ -75,12 +75,11 @@ void ImageOverlay::render(RenderArgs* args) {
glm::vec2 topLeft(left, top); glm::vec2 topLeft(left, top);
glm::vec2 bottomRight(right, bottom); glm::vec2 bottomRight(right, bottom);
// if for some reason our image is not over 0 width or height, don't attempt to render the image
if (_renderImage) {
float imageWidth = _texture->getWidth(); float imageWidth = _texture->getWidth();
float imageHeight = _texture->getHeight(); float imageHeight = _texture->getHeight();
if (imageWidth > 0 && imageHeight > 0) {
// if for some reason our image is not over 0 width or height, don't attempt to render the image
if (_renderImage && imageWidth > 0 && imageHeight > 0) {
QRect fromImage; QRect fromImage;
if (_wantClipFromImage) { if (_wantClipFromImage) {
float scaleX = imageWidth / _texture->getOriginalWidth(); float scaleX = imageWidth / _texture->getOriginalWidth();
@ -90,7 +89,8 @@ void ImageOverlay::render(RenderArgs* args) {
fromImage.setY(scaleY * _fromImage.y()); fromImage.setY(scaleY * _fromImage.y());
fromImage.setWidth(scaleX * _fromImage.width()); fromImage.setWidth(scaleX * _fromImage.width());
fromImage.setHeight(scaleY * _fromImage.height()); fromImage.setHeight(scaleY * _fromImage.height());
} else { }
else {
fromImage.setX(0); fromImage.setX(0);
fromImage.setY(0); fromImage.setY(0);
fromImage.setWidth(imageWidth); fromImage.setWidth(imageWidth);
@ -109,9 +109,9 @@ void ImageOverlay::render(RenderArgs* args) {
} else { } else {
DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, quadColor); DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, quadColor);
} }
if (_renderImage) {
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} else {
DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, quadColor);
} }
} }