From a4e6227af28dbd59dc5a9063a73935e6d91af0e5 Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Fri, 16 Aug 2024 00:02:14 +0200
Subject: [PATCH] Fix CLI args

---
 src/backend/Core.cpp        | 2 +-
 src/backend/Core.hpp        | 2 +-
 src/backend/core/Mem.cpp    | 2 +-
 src/frontend/KaizenQt.cpp   | 7 +++++--
 src/frontend/KaizenQt.hpp   | 2 +-
 src/frontend/MainWindow.cpp | 3 ---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/backend/Core.cpp b/src/backend/Core.cpp
index db1969f1..d7b5bd21 100644
--- a/src/backend/Core.cpp
+++ b/src/backend/Core.cpp
@@ -12,7 +12,7 @@ void Core::Stop() {
   cpu->Reset();
 }
 
-bool Core::LoadTAS(const fs::path &path) {
+bool Core::LoadTAS(const fs::path &path) const {
   return cpu->GetMem().mmio.si.pif.movie.Load(path);
 }
 
diff --git a/src/backend/Core.hpp b/src/backend/Core.hpp
index d80a2e00..a253ee15 100644
--- a/src/backend/Core.hpp
+++ b/src/backend/Core.hpp
@@ -10,7 +10,7 @@ struct Core {
   Core(ParallelRDP&);
   void Stop();
   void LoadROM(const std::string&);
-  bool LoadTAS(const fs::path&);
+  bool LoadTAS(const fs::path&) const;
   void Run(float volumeL, float volumeR);
   void Serialize();
   void Deserialize();
diff --git a/src/backend/core/Mem.cpp b/src/backend/core/Mem.cpp
index 41fe5ae7..2c0c21c1 100644
--- a/src/backend/core/Mem.cpp
+++ b/src/backend/core/Mem.cpp
@@ -249,7 +249,7 @@ template<> u32 Mem::Read(n64::Registers &regs, u32 paddr) {
       return Util::ReadAccess<u32>(si.pif.bootrom, paddr - PIF_ROM_REGION_START);
     case PIF_RAM_REGION:
       return be32toh(Util::ReadAccess<u32>(si.pif.ram, paddr - PIF_RAM_REGION_START));
-    case 0x00800000 ... 0x03EFFFFF: case 0x04200000 ... 0x042FFFFF:
+    case 0x00800000 ... 0x03FFFFFF: case 0x04200000 ... 0x042FFFFF:
     case 0x04900000 ... 0x04FFFFFF: case 0x1FC00800 ... 0xFFFFFFFF: return 0;
     default:
       Util::panic("Unimplemented 32-bit read at address {:08X} (PC = {:016X})", paddr, (u64) regs.pc);
diff --git a/src/frontend/KaizenQt.cpp b/src/frontend/KaizenQt.cpp
index 32e3f066..9eb1cb00 100644
--- a/src/frontend/KaizenQt.cpp
+++ b/src/frontend/KaizenQt.cpp
@@ -55,6 +55,9 @@ void KaizenQt::dropEvent(QDropEvent* event) {
 }
 
 void KaizenQt::LoadROM(const QString& fileName) noexcept {
+  mainWindow->view.actionPause->setEnabled(true);
+  mainWindow->view.actionReset->setEnabled(true);
+  mainWindow->view.actionStop->setEnabled(true);
   emuThread->start();
   emuThread->core.LoadROM(fileName.toStdString());
   mainWindow->setWindowTitle(emuThread->core.cpu->GetMem().rom.gameNameDB.c_str());
@@ -68,8 +71,8 @@ void KaizenQt::Quit() noexcept {
   QApplication::quit();
 }
 
-void KaizenQt::LoadTAS(const QString& fileName) noexcept {
-  emuThread->core.LoadTAS(fileName.toStdString());
+void KaizenQt::LoadTAS(const QString& fileName) const noexcept {
+  emuThread->core.LoadTAS(fs::path(fileName.toStdString()));
 }
 
 void KaizenQt::keyPressEvent(QKeyEvent *e) {
diff --git a/src/frontend/KaizenQt.hpp b/src/frontend/KaizenQt.hpp
index ec7cf786..23c129a9 100644
--- a/src/frontend/KaizenQt.hpp
+++ b/src/frontend/KaizenQt.hpp
@@ -27,7 +27,7 @@ class KaizenQt : public QWidget {
   Q_OBJECT
 public:
   KaizenQt() noexcept;
-  void LoadTAS(const QString& path) noexcept;
+  void LoadTAS(const QString& path) const noexcept;
   void LoadROM(const QString& path) noexcept;
   void dropEvent(QDropEvent*) override;
   void dragEnterEvent(QDragEnterEvent*) override;
diff --git a/src/frontend/MainWindow.cpp b/src/frontend/MainWindow.cpp
index 7470a31f..b4588467 100644
--- a/src/frontend/MainWindow.cpp
+++ b/src/frontend/MainWindow.cpp
@@ -19,9 +19,6 @@ void MainWindowController::ConnectSignalsToSlots() noexcept {
       "All supported types (*.zip *.ZIP *.7z *.7Z *.rar *.RAR *.tar *.TAR *.n64 *.N64 *.v64 *.V64 *.z64 *.Z64)");
 
     if (!file_name.isEmpty()) {
-      view.actionPause->setEnabled(true);
-      view.actionReset->setEnabled(true);
-      view.actionStop->setEnabled(true);
       emit OpenROM(file_name);
       view.vulkanWidget->show();
     }