Merge branch 'master' of https://github.com/Skarsnik/Savestate2snes

Skarsnik · Skarsnik · commit 03a4c49b2244 · 2021-01-15T10:28:40.000+01:00
diff --git a/usb2snesstatut.cpp b/usb2snesstatut.cpp
@@ -211,14 +211,15 @@ void USB2SnesStatut::onTimerTick()
     sDebug() << "tick infos : " << infos;
     if (infos.isEmpty())
         return ;
-    if (infos.at(2) != "/sd2snes/menu.bin" && romRunning == false)
+    bool isMenuRom = infos.at(2) == "/sd2snes/menu.bin" || infos.at(2) == "/sd2snes/m3nu.bin";
+    if (isMenuRom == false && romRunning == false)
     {
         romRunning = true;
         menuRunning = false;
         onRomStarted();
         timer.setInterval(CHECK_ROMRUNNING_TICK * 2);
     }
-    if (infos.at(2) == "/sd2snes/menu.bin" && menuRunning == false)
+    if (isMenuRom == true && menuRunning == false)
     {
         ui->romPatchedLabel->setText(tr("SD2SNES on Menu"));
         romRunning = false;

Original file line number	Diff line number	Diff line change
`@@ -211,14 +211,15 @@ void USB2SnesStatut::onTimerTick()`
`211`	`211`	`sDebug() << "tick infos : " << infos;`
`212`	`212`	`if (infos.isEmpty())`
`213`	`213`	`return ;`
`214`		`- if (infos.at(2) != "/sd2snes/menu.bin" && romRunning == false)`
	`214`	`+ bool isMenuRom = infos.at(2) == "/sd2snes/menu.bin" \|\| infos.at(2) == "/sd2snes/m3nu.bin";`
	`215`	`+ if (isMenuRom == false && romRunning == false)`
`215`	`216`	`{`
`216`	`217`	`romRunning = true;`
`217`	`218`	`menuRunning = false;`
`218`	`219`	`onRomStarted();`
`219`	`220`	`timer.setInterval(CHECK_ROMRUNNING_TICK * 2);`
`220`	`221`	`}`
`221`		`- if (infos.at(2) == "/sd2snes/menu.bin" && menuRunning == false)`
	`222`	`+ if (isMenuRom == true && menuRunning == false)`
`222`	`223`	`{`
`223`	`224`	`ui->romPatchedLabel->setText(tr("SD2SNES on Menu"));`
`224`	`225`	`romRunning = false;`