Skip to content

Commit 971069d

Browse files
committed
Extra fixes, based on code review
* Fix MARQUEE entry in retroarch.h * Add more negative tests to testSupportedMedia * Remove unnecessary path check in frontendExtra read
1 parent 1c3d208 commit 971069d

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/retroarch.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,13 @@ void RetroArch::assembleList(QString &finalOutput,
162162

163163
if (!config->frontendExtra.isEmpty()) {
164164
// frontendExtra is used for default_core_path and default_core_name
165-
// when it contains a path separator (/). Format:
166-
// "<CORE_PATH>;<CORE_NAME>"
167-
if (config->frontendExtra.contains("/")) {
168-
QStringList parts = config->frontendExtra.split(";");
169-
if (parts.length() >= 1) {
170-
corePathStr = parts[0];
171-
}
172-
if (parts.length() >= 2) {
173-
coreNameStr = parts[1];
174-
}
165+
// Format: "<CORE_PATH>;<CORE_NAME>"
166+
QStringList parts = config->frontendExtra.split(";");
167+
if (parts.length() >= 1) {
168+
corePathStr = parts[0];
169+
}
170+
if (parts.length() >= 2) {
171+
coreNameStr = parts[1];
175172
}
176173
}
177174

@@ -268,4 +265,4 @@ QString RetroArch::getWheelsFolder() {
268265
QString RetroArch::getTitleScreenshotsFolder() {
269266
return config->mediaFolder % "/Named_Titles";
270267
}
271-
*/
268+
*/

src/retroarch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class RetroArch : public AbstractFrontend {
4646

4747
GameEntry::Types supportedMedia() override {
4848
return GameEntry::Types(GameEntry::COVER | GameEntry::SCREENSHOT |
49-
GameEntry::WHEEL);
49+
GameEntry::MARQUEE | GameEntry::WHEEL);
5050
}
5151

5252
protected:

test/retroarch/test_retroarch.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ private slots:
246246

247247
// Should NOT support MANUAL, TEXTURE, FANART, BACKCOVER
248248
QVERIFY(!(supported & GameEntry::MANUAL));
249+
QVERIFY(!(supported & GameEntry::TEXTURE));
250+
QVERIFY(!(supported & GameEntry::FANART));
251+
QVERIFY(!(supported & GameEntry::BACKCOVER));
249252
}
250253

251254
// Test frontend capabilities flags through public interface
@@ -388,4 +391,4 @@ private slots:
388391
};
389392

390393
QTEST_MAIN(TestRetroArch)
391-
#include "test_retroarch.moc"
394+
#include "test_retroarch.moc"

0 commit comments

Comments
 (0)