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

src/common/bspf.hxx

@@ -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));
       });

src/common/repository/sqlite/StellaDb.cxx

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

src/gui/LauncherDialog.cxx

@@ -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());
 }

src/unix/r77/OSystemR77.cxx

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

src/unix/r77/SettingsR77.cxx

@@ -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"
   );
+  */
 }