From be9e654bd097157dcaf1b862adfb0c1de1d601be Mon Sep 17 00:00:00 2001 From: nattycleopatra Date: Sun, 14 Jun 2015 12:19:38 +0200 Subject: [PATCH 1/2] (RMenu) Use menu_animation_get_ptr --- menu/drivers/rmenu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index 66a1bd0ac5..4dab535d1a 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -128,6 +128,7 @@ static void rmenu_render(void) char title_buf[256] = {0}; char title_msg[64] = {0}; menu_handle_t *menu = menu_driver_get_ptr(); + menu_animation_t *anim = menu_animation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr(); global_t *global = global_get_ptr(); @@ -148,7 +149,7 @@ static void rmenu_render(void) return; menu_display_fb_unset_dirty(); - menu->animation_is_active = false; + anim->is_active = false; menu->label.is_updated = false; if (!menu_list->selection_buf) From edc4077d30e8422787132faa9b1fd7d39a22e49c Mon Sep 17 00:00:00 2001 From: nattycleopatra Date: Sun, 14 Jun 2015 12:33:08 +0200 Subject: [PATCH 2/2] (PS3) Remove unused makefile from distscripts --- dist-scripts/ps3-cores-cex-355.sh | 2 -- dist-scripts/ps3-cores-cobraode.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/dist-scripts/ps3-cores-cex-355.sh b/dist-scripts/ps3-cores-cex-355.sh index dc062b2dda..7592a4f8e5 100755 --- a/dist-scripts/ps3-cores-cex-355.sh +++ b/dist-scripts/ps3-cores-cex-355.sh @@ -2,11 +2,9 @@ RARCH_VERSION=0.9.9 make -C ../ -f Makefile.ps3.salamander clean || exit 1 -make -C ../ -f Makefile.ps3.rgl clean || exit 1 make -C ../ -f Makefile.ps3 clean || exit 1 make -C ../ -f Makefile.ps3.salamander || exit 1 -make -C ../ -f Makefile.ps3.rgl || exit 1 EXE_PATH=/usr/local/cell/host-win32/bin diff --git a/dist-scripts/ps3-cores-cobraode.sh b/dist-scripts/ps3-cores-cobraode.sh index bbcaa186d9..65346ea5a6 100644 --- a/dist-scripts/ps3-cores-cobraode.sh +++ b/dist-scripts/ps3-cores-cobraode.sh @@ -2,11 +2,9 @@ #For this script to work correctly, you must place the "data" folder containing your ps3 keys for scetool to use in the dist-scripts folder. make -C ../ -f Makefile.ps3.salamander clean || exit 1 -make -C ../ -f Makefile.ps3.rgl clean || exit 1 make -C ../ -f Makefile.ps3.cobra clean || exit 1 make -C ../ -f Makefile.ps3.salamander || exit 1 -make -C ../ -f Makefile.ps3.rgl || exit 1 GENPS3ISO_PATH=/cygdrive/c/Cobra_ODE_GenPS3iso_v2.3/genps3iso.exe SCETOOL_PATH=/cygdrive/c/Users/aaa801/ps3tools/ps3tools/tools/scetool/scetool.exe