summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-09-15 15:45:53 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-16 11:03:41 (GMT)
commiteac109a563682422f67b19e2a04cb8d0628c7185 (patch)
treec97687e7a0207afe09d6529d35ebec362397e0e3 /src
parent95bbd04d212a35d19af4f13375914971aeed758e (diff)
downloadpowder-eac109a563682422f67b19e2a04cb8d0628c7185.zip
powder-eac109a563682422f67b19e2a04cb8d0628c7185.tar.gz
fix possible crashes with save buttons and uninitialized renderer variables
Fixes second part of issue 179
Diffstat (limited to 'src')
-rw-r--r--src/graphics/Renderer.cpp2
-rw-r--r--src/interface/SaveButton.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index c186b66..7d5f28b 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -1123,7 +1123,7 @@ void Renderer::render_parts()
colr = PIXR(elements[t].Colour);
colg = PIXG(elements[t].Colour);
colb = PIXB(elements[t].Colour);
- firea = 0;
+ firer = fireg = fireb = firea = 0;
deca = (sim->parts[i].dcolour>>24)&0xFF;
decr = (sim->parts[i].dcolour>>16)&0xFF;
diff --git a/src/interface/SaveButton.cpp b/src/interface/SaveButton.cpp
index 66a6e66..35be432 100644
--- a/src/interface/SaveButton.cpp
+++ b/src/interface/SaveButton.cpp
@@ -230,13 +230,12 @@ void SaveButton::OnMouseUnclick(int x, int y, unsigned int button)
if(isButtonDown)
{
+ isButtonDown = false;
if(isMouseInsideAuthor)
DoAuthorAction();
else
DoAction();
}
-
- isButtonDown = false;
}
void SaveButton::OnMouseClick(int x, int y, unsigned int button)