zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- formatting fix and null check for aborted transition.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-30 23:45:43 +01:00
parent c36402eb5c
commit 06d5705ae6
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/menu/imagescroller.cpp
View file

@ -112,7 +112,7 @@ bool DImageScrollerMenu::MenuEvent(int mkey, bool fromcontroller)
case MKEY_Back: case MKEY_Back:
// Before going back the currently running transition must be terminated. // Before going back the currently running transition must be terminated.
pageTransition.previous = nullptr; pageTransition.previous = nullptr;
pageTransition.current->origin = { 0,0 }; if (pageTransition.current) pageTransition.current->origin = { 0,0 };
return DMenu::MenuEvent(mkey, fromcontroller); return DMenu::MenuEvent(mkey, fromcontroller);
case MKEY_Left: case MKEY_Left:

3
source/common/menu/loadsavemenu.cpp
View file

@ -131,6 +131,7 @@ protected:
commentRight = commentLeft + commentWidth; commentRight = commentLeft + commentWidth;
commentBottom = commentTop + commentHeight; commentBottom = commentTop + commentHeight;
commentRows = commentHeight / rowHeight; commentRows = commentHeight / rowHeight;
UpdateSaveComment();
} }
//============================================================================= //=============================================================================
@ -252,7 +253,7 @@ protected:
void UpdateSaveComment() void UpdateSaveComment()
{ {
//BrokenSaveComment = NewConsoleFont.BreakLines(manager.SaveCommentString, int(commentWidth / FontScale)); BrokenSaveComment = V_BreakLines(NewConsoleFont, int(commentWidth / FontScale), savegameManager.SaveCommentString);
} }
//============================================================================= //=============================================================================