ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2021-01-08 09:50:08 +01:00
parent 2ec5506c05 9bd2f3e4f6
commit f336437955
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/bspf.hxx
View File

@ -244,7 +244,7 @@ namespace BSPF
// starting from 'startpos' in the first string
static size_t findIgnoreCase(string_view s1, string_view s2, size_t startpos = 0)
{
auto pos = std::search(s1.cbegin()+startpos, s1.cend(),
const auto* pos = std::search(s1.cbegin()+startpos, s1.cend(),
s2.cbegin(), s2.cend(), [](char ch1, char ch2) {
return toupper(uInt8(ch1)) == toupper(uInt8(ch2));
});

1
src/common/repository/sqlite/StellaDb.cxx
View File

@ -77,6 +77,7 @@ void StellaDb::initialize()
mySettingsRepository = make_unique<KeyValueRepositoryNoop>();
myPropertyRepository = make_unique<CompositeKeyValueRepositoryNoop>();
myHighscoreRepository = make_unique<CompositeKeyValueRepositoryNoop>();
myDb.reset();
myPropertyRepositoryHost.reset();

3
src/gui/LauncherDialog.cxx
View File

@ -410,7 +410,8 @@ void LauncherDialog::loadConfig()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void LauncherDialog::saveConfig()
{
instance().settings().setValue("launchersubdirs", mySubDirs->getState());
if (mySubDirs)
instance().settings().setValue("launchersubdirs", mySubDirs->getState());
if(instance().settings().getBool("followlauncher"))
instance().settings().setValue("romdir", myList->currentDir().getShortPath());
}

2
src/unix/r77/OSystemR77.cxx
View File

@ -21,5 +21,5 @@
void OSystemR77::getBaseDirectories(string& basedir, string& homeDir,
bool, const string&)
{
basedir = homeDir = "/mnt/stella";
basedir = homeDir = "/mnt/stella/";
}

2
src/unix/r77/SettingsR77.cxx
View File

@ -76,9 +76,11 @@ SettingsR77::SettingsR77()
setPermanent("dejitter.base", "2");
setPermanent("dejitter.diff", "6");
/*
setPermanent("joymap",
string() +
"128^i2c_controller|4 17 18 15 16 31 31 35 35 121 122 112 113 0 0 0 0|8 19 20 100 99 103 0 0 0 120 123 127 126 0 124 0 0|" +
"0^i2c_controller #2|4 24 25 22 23 39 39 43 43 121 122 112 113 0 0 0 0|8 26 27 100 99 103 110 0 0 120 123 127 126 0 124 0 0|0"
);
*/
}