mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-14 22:38:34 +00:00
Merge pull request #238 from CatalystG/master
(BlackBerry) Fix up core_info usage after cleanup.
This commit is contained in:
commit
87d6d9e201
blackberry-qnx/bb10
@ -69,7 +69,7 @@
|
|||||||
<asset path="../../media/overlays">overlays</asset>
|
<asset path="../../media/overlays">overlays</asset>
|
||||||
<asset path="assets">assets</asset>
|
<asset path="assets">assets</asset>
|
||||||
<asset path="assets/images/icon.png">icon.png</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. -->
|
<!-- Bright theme is used for this application. -->
|
||||||
|
@ -87,7 +87,7 @@ RetroArch::RetroArch()
|
|||||||
//Get core DropDown reference to populate it in C++
|
//Get core DropDown reference to populate it in C++
|
||||||
coreSelection = mAppPane->findChild<DropDown*>("dropdown_core");
|
coreSelection = mAppPane->findChild<DropDown*>("dropdown_core");
|
||||||
connect(coreSelection, SIGNAL(selectedValueChanged(QVariant)), this, SLOT(onCoreSelected(QVariant)));
|
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);
|
populateCores(core_info_list);
|
||||||
|
|
||||||
Application::instance()->setScene(mAppPane);
|
Application::instance()->setScene(mAppPane);
|
||||||
@ -246,7 +246,6 @@ void RetroArch::onCoreSelected(QVariant value)
|
|||||||
coreSelectedIndex = value.toInt();
|
coreSelectedIndex = value.toInt();
|
||||||
|
|
||||||
core.clear();
|
core.clear();
|
||||||
core.append("app/native/lib/");
|
|
||||||
core.append(core_info_list->list[coreSelectedIndex].path);
|
core.append(core_info_list->list[coreSelectedIndex].path);
|
||||||
emit coreChanged(core);
|
emit coreChanged(core);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user