mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

willReloadData at the end of menu_entry_select was causing issues

Browse Source
This commit is contained in:
Twinaphex 2015-08-16 23:52:39 +02:00
parent dadd382dfd
commit 2afd79d0f0
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
View File

@ -7,7 +7,7 @@
<key>IDESourceControlProjectIdentifier</key> <key>IDESourceControlProjectIdentifier</key>
<string>6D7FAF49-495D-480E-B0C9-8C39AC77CE3C</string> <string>6D7FAF49-495D-480E-B0C9-8C39AC77CE3C</string>
<key>IDESourceControlProjectName</key> <key>IDESourceControlProjectName</key>
<string>project</string> <string>RetroArch_iOS</string>
<key>IDESourceControlProjectOriginsDictionary</key> <key>IDESourceControlProjectOriginsDictionary</key>
<dict> <dict>
<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key> <key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
@ -24,21 +24,21 @@
<string>https://github.com/libretro/common-overlays.git</string> <string>https://github.com/libretro/common-overlays.git</string>
</dict> </dict>
<key>IDESourceControlProjectPath</key> <key>IDESourceControlProjectPath</key>
<string>apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace</string> <string>apple/iOS/RetroArch_iOS.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key> <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict> <dict>
<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key> <key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
<string>../../../..media/autoconfig/</string> <string>../../../..media/autoconfig</string>
<key>76200F0D6584D865E96F58DE862E738E88B23A3C</key> <key>76200F0D6584D865E96F58DE862E738E88B23A3C</key>
<string>../../../../..</string> <string>../../../../..</string>
<key>A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6</key> <key>A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6</key>
<string>../../../..media/assets/</string> <string>../../../..media/assets</string>
<key>C3AEE01BDA902108663DB5DB9CD7916436919463</key> <key>C3AEE01BDA902108663DB5DB9CD7916436919463</key>
<string>../../../..media/libretrodb/</string> <string>../../../..media/libretrodb</string>
<key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key> <key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key>
<string>../../../..</string> <string>../../../..</string>
<key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key> <key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key>
<string>../../../..media/overlays/</string> <string>../../../..media/overlays</string>
</dict> </dict>
<key>IDESourceControlProjectURL</key> <key>IDESourceControlProjectURL</key>
<string>https://github.com/libretro/RetroArch.git</string> <string>https://github.com/libretro/RetroArch.git</string>

12
menu/cbs/menu_cbs_select.c
View File

@ -35,9 +35,8 @@ static int action_select_default(const char *path, const char *label, unsigned t
cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, idx); cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, idx);
if (setting)
RARCH_LOG("setting->type: %d\n", setting->type); {
switch (setting->type) switch (setting->type)
{ {
case ST_BOOL: case ST_BOOL:
@ -50,6 +49,12 @@ static int action_select_default(const char *path, const char *label, unsigned t
action = MENU_ACTION_OK; action = MENU_ACTION_OK;
break; break;
default: default:
break;
}
}
if (action == MENU_ACTION_NOOP)
{
if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting)) if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
action = MENU_ACTION_OK; action = MENU_ACTION_OK;
else else
@ -59,7 +64,6 @@ static int action_select_default(const char *path, const char *label, unsigned t
if (cbs && cbs->action_right) if (cbs && cbs->action_right)
action = MENU_ACTION_RIGHT; action = MENU_ACTION_RIGHT;
} }
break;
} }
if (action != MENU_ACTION_NOOP) if (action != MENU_ACTION_NOOP)

2
ui/drivers/cocoa/cocoatouch_menu.m
View File

@ -741,7 +741,9 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
- (void)menuSelect: (uint32_t) i - (void)menuSelect: (uint32_t) i
{ {
menu_entry_select(i); menu_entry_select(i);
#if 0
[self willReloadData]; [self willReloadData];
#endif
} }
- (void)menuBack - (void)menuBack