zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- formatting fix and null check for aborted transition.

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:
// Before going back the currently running transition must be terminated.
pageTransition.previous = nullptr;
pageTransition.current->origin = { 0,0 };
if (pageTransition.current) pageTransition.current->origin = { 0,0 };
return DMenu::MenuEvent(mkey, fromcontroller);
case MKEY_Left:

5
source/common/menu/loadsavemenu.cpp
View File

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