CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 06:18:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #238 from CatalystG/master

Browse Source 
(BlackBerry) Fix up core_info usage after cleanup.
This commit is contained in:
Squarepusher 2013-06-25 22:54:54 -07:00
commit 87d6d9e201
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blackberry-qnx/bb10/bar-descriptor.xml
View File

@ -69,7 +69,7 @@
<asset path="../../media/overlays">overlays</asset>
<asset path="assets">assets</asset>
<asset path="assets/images/icon.png">icon.png</asset>
<asset path="../../ios/modules">modules</asset>
<asset path="../../ios/modules">lib</asset>
<!-- Bright theme is used for this application. -->

3
blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
View File

@ -87,7 +87,7 @@ RetroArch::RetroArch()
//Get core DropDown reference to populate it in C++
coreSelection = mAppPane->findChild<DropDown*>("dropdown_core");
connect(coreSelection, SIGNAL(selectedValueChanged(QVariant)), this, SLOT(onCoreSelected(QVariant)));
core_info_list = get_core_info_list("/app/native/modules/");
core_info_list = get_core_info_list(g_settings.libretro);
populateCores(core_info_list);
Application::instance()->setScene(mAppPane);
@ -246,7 +246,6 @@ void RetroArch::onCoreSelected(QVariant value)
coreSelectedIndex = value.toInt();
core.clear();
core.append("app/native/lib/");
core.append(core_info_list->list[coreSelectedIndex].path);
emit coreChanged(core);