eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't dim the screen if already dimmed.

Browse Source
This commit is contained in:
sorgelig
2019-06-26 02:35:50 +08:00
parent e52ae6ba82
commit 7f6250cfd8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
menu.cpp
View File

@@ -840,14 +840,15 @@ void HandleUI(void)
if (timeout && CheckTimer(timeout))
{
timeout = 0;
if (menu_visible)
if (menu_visible > 0)
{
menu_visible = 0;
video_menu_bg((user_io_8bit_set_status(0, 0) & 0xE) >> 1, 1);
spi_osd_cmd(MM1_OSDCMDDISABLE);
}
else
else if (!menu_visible)
{
menu_visible--;
video_menu_bg((user_io_8bit_set_status(0, 0) & 0xE) >> 1, 2);
}
}
@@ -855,7 +856,7 @@ void HandleUI(void)
if (c || menustate != MENU_FILE_SELECT2)
{
timeout = 0;
if (!menu_visible)
if (menu_visible <= 0)
{
c = 0;
menu_visible = 1;
@@ -868,7 +869,7 @@ void HandleUI(void)
if (!timeout)
{
if (!cfg.osd_timeout) cfg.osd_timeout = 30;
timeout = GetTimer(cfg.osd_timeout*1000);
timeout = GetTimer(cfg.osd_timeout * 1000);
}
}
else

4
video.cpp
View File

@@ -1029,9 +1029,9 @@ void video_menu_bg(int n, int idle)
}
}
if (curtain && idle > 1)
if (curtain)
{
if (*bg)
if (idle > 1 && *bg)
{
imlib_context_set_image(*bg);
imlib_blend_image_onto_image(curtain, 1,