summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2016-09-29 20:36:05 -0500
committer cracyc <cracyc@users.noreply.github.com>2016-09-29 20:36:43 -0500
commit45ad154c87bf9cbb90b92a1b3a2eecd680de3307 (patch)
tree37011bf3382bafdc331cfd249ad64578f1bc385c
parent78d4e6db5b71c3ff2ce193ab9177c64062b37063 (diff)
ui/selgame: fix crash (nw)
-rw-r--r--plugins/data/load_dat.lua2
-rw-r--r--src/frontend/mame/ui/selgame.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua
index e6d0c5d63b8..3e9f88dab80 100644
--- a/plugins/data/load_dat.lua
+++ b/plugins/data/load_dat.lua
@@ -84,7 +84,7 @@ function datfile.open(file, vertag)
end
fh:seek("set", data[tag1][tag2][set])
for line in fh:lines() do
- if line == "$end" then
+ if line:sub(1, 4) == "$end" then
return table.concat(output, "\n")
end
output[#output + 1] = line
diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp
index 0642be59cb5..2e4c3c7de17 100644
--- a/src/frontend/mame/ui/selgame.cpp
+++ b/src/frontend/mame/ui/selgame.cpp
@@ -293,7 +293,7 @@ void menu_select_game::handle()
if (!isfavorite())
{
const game_driver *drv = (const game_driver *)menu_event->itemref;
- if ((FPTR)drv > skip_main_items && ui_globals::curdats_view < ui_globals::curdats_total)
+ if ((FPTR)drv > skip_main_items && ui_globals::curdats_view < (ui_globals::curdats_total - 1))
{
ui_globals::curdats_view++;
m_topline_datsview = 0;
@@ -302,12 +302,12 @@ void menu_select_game::handle()
else
{
ui_software_info *drv = (ui_software_info *)menu_event->itemref;
- if (drv->startempty == 1 && ui_globals::curdats_view < ui_globals::curdats_total)
+ if (drv->startempty == 1 && ui_globals::curdats_view < (ui_globals::curdats_total - 1))
{
ui_globals::curdats_view++;
m_topline_datsview = 0;
}
- else if ((FPTR)drv > skip_main_items && ui_globals::cur_sw_dats_view < ui_globals::cur_sw_dats_total)
+ else if ((FPTR)drv > skip_main_items && ui_globals::cur_sw_dats_view < (ui_globals::cur_sw_dats_total - 1))
{
ui_globals::cur_sw_dats_view++;
m_topline_datsview = 0;