diff options
| author | jacob1 <jfu614@gmail.com> | 2013-01-23 05:26:57 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-01-23 05:26:57 (GMT) |
| commit | 07aade6c4c6de5384f1ad57a28592d0ac885e4c3 (patch) | |
| tree | 8f5f2ebd261f821e39d278643c1a8f0358d04d12 /src | |
| parent | 28fdb32bfb81f48170138c1b62fbca310ab84622 (diff) | |
| download | powder-07aade6c4c6de5384f1ad57a28592d0ac885e4c3.zip powder-07aade6c4c6de5384f1ad57a28592d0ac885e4c3.tar.gz | |
fix crash when pressing enter to open a save, and not logged in. Fix CRAY description
Diffstat (limited to 'src')
| -rw-r--r-- | src/preview/PreviewView.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/elements/CRAY.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/preview/PreviewView.cpp b/src/preview/PreviewView.cpp index 238e4cc..4b12ea9 100644 --- a/src/preview/PreviewView.cpp +++ b/src/preview/PreviewView.cpp @@ -365,7 +365,7 @@ void PreviewView::OnMouseWheel(int x, int y, int d) void PreviewView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt) { - if ((key == KEY_ENTER || key == KEY_RETURN) && !addCommentBox->IsFocused()) + if ((key == KEY_ENTER || key == KEY_RETURN) && (!addCommentBox || !addCommentBox->IsFocused())) openButton->DoAction(); } diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index eaf4a11..93c8db9 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 0; - Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp2"; + Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp"; State = ST_SOLID; Properties = TYPE_SOLID|PROP_LIFE_DEC; |