fix #2083 and minor cleanup
This commit is contained in:
parent
f13c70d028
commit
aa443c8846
|
@ -96,7 +96,7 @@ CommandLineOptions* ManageArgs(QApplication& melon)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
options->errorsToDisplay += "Option -a/--archive-file given, but no archive specified!";
|
Log(LogLevel::Error, "Option -a/--archive-file given, but no archive specified!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ CommandLineOptions* ManageArgs(QApplication& melon)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
options->errorsToDisplay += "Option -A/--archive-file-gba given, but no archive specified!";
|
Log(LogLevel::Error, "Option -A/--archive-file-gba given, but no archive specified!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -28,8 +28,6 @@ namespace CLI {
|
||||||
|
|
||||||
struct CommandLineOptions
|
struct CommandLineOptions
|
||||||
{
|
{
|
||||||
QStringList errorsToDisplay = {};
|
|
||||||
|
|
||||||
std::optional<QString> dsRomPath;
|
std::optional<QString> dsRomPath;
|
||||||
std::optional<QString> dsRomArchivePath;
|
std::optional<QString> dsRomArchivePath;
|
||||||
std::optional<QString> gbaRomPath;
|
std::optional<QString> gbaRomPath;
|
||||||
|
|
|
@ -364,6 +364,9 @@ int main(int argc, char** argv)
|
||||||
if (memberSyntaxUsed) printf("Warning: use the a.zip|b.nds format at your own risk!\n");
|
if (memberSyntaxUsed) printf("Warning: use the a.zip|b.nds format at your own risk!\n");
|
||||||
|
|
||||||
win->preloadROMs(dsfile, gbafile, options->boot);
|
win->preloadROMs(dsfile, gbafile, options->boot);
|
||||||
|
|
||||||
|
if (options->fullscreen)
|
||||||
|
ToggleFullscreen(win);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ret = melon.exec();
|
int ret = melon.exec();
|
||||||
|
|
Loading…
Reference in New Issue