From 9385de10819610276e4ba654aeec7af724417922 Mon Sep 17 00:00:00 2001
From: SimoZ64 <simococo03@gmail.com>
Date: Wed, 13 Aug 2025 13:59:16 +0200
Subject: [PATCH] Small things

---
 src/frontend/KaizenGui.cpp | 13 +++++++------
 src/frontend/KaizenGui.hpp |  2 +-
 src/frontend/main.cpp      |  4 ++--
 src/utils/ErrorData.hpp    |  2 ++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/frontend/KaizenGui.cpp b/src/frontend/KaizenGui.cpp
index 3f289576..bc1b5ad5 100644
--- a/src/frontend/KaizenGui.cpp
+++ b/src/frontend/KaizenGui.cpp
@@ -38,7 +38,7 @@ void KaizenGui::QueryDevices(SDL_Event event) {
 
 void KaizenGui::HandleInput(SDL_Event event) {
   n64::Core& core = n64::Core::GetInstance();
-  n64::PIF &pif = core.GetMem().mmio.si.pif;
+  n64::PIF &pif = n64::Core::GetMem().mmio.si.pif;
   switch(event.type) {
     case SDL_EVENT_GAMEPAD_AXIS_MOTION:
       if(!gamepad)
@@ -89,8 +89,6 @@ void KaizenGui::HandleInput(SDL_Event event) {
       break;
     case SDL_EVENT_KEY_DOWN:
     case SDL_EVENT_KEY_UP:
-      if(gamepad)
-        break;
       {
         auto keys = SDL_GetKeyboardState(nullptr);
         if((keys[SDL_SCANCODE_LCTRL] || keys[SDL_SCANCODE_RCTRL]) && keys[SDL_SCANCODE_O]) {
@@ -115,6 +113,9 @@ void KaizenGui::HandleInput(SDL_Event event) {
           }
         }
 
+        if(gamepad)
+          break;
+
         pif.UpdateButton(0, n64::Controller::Key::Z, keys[SDL_SCANCODE_Z]);
         pif.UpdateButton(0, n64::Controller::Key::CUp, keys[SDL_SCANCODE_HOME]);
         pif.UpdateButton(0, n64::Controller::Key::CDown, keys[SDL_SCANCODE_END]);
@@ -211,7 +212,7 @@ void KaizenGui::RenderUI() {
     ImGui::EndMainMenuBar();
   }
 
-  if(!Util::Error::GetInstance().IsHandled()) {
+  if(!Util::Error::IsHandled()) {
     ImGui::OpenPopup(Util::Error::GetSeverity().as_c_str());
   }
   
@@ -354,7 +355,7 @@ void KaizenGui::RenderUI() {
     fileDialogOpen = false;
     const SDL_DialogFileFilter filters[] = {{"All files", "*"}, {"Nintendo 64 executable", "n64;z64;v64"}, {"Nintendo 64 executable archive", "rar;tar;zip;7z"}};
     SDL_ShowOpenFileDialog([](void *userdata, const char * const *filelist, int filter) {
-      KaizenGui* kaizen = (KaizenGui*)userdata;
+      auto kaizen = (KaizenGui*)userdata;
       
       if (!filelist) {
         panic("An error occured: {}", SDL_GetError());
@@ -413,6 +414,6 @@ void KaizenGui::run() {
   }
 }
 
-void KaizenGui::LoadTAS(const std::string &path) const noexcept {
+void KaizenGui::LoadTAS(const std::string &path) noexcept {
   n64::Core::GetInstance().LoadTAS(fs::path(path));
 }
\ No newline at end of file
diff --git a/src/frontend/KaizenGui.hpp b/src/frontend/KaizenGui.hpp
index 47899662..a884ac8b 100644
--- a/src/frontend/KaizenGui.hpp
+++ b/src/frontend/KaizenGui.hpp
@@ -24,7 +24,7 @@ public:
   SDL_Gamepad* gamepad = nullptr;
   
   void run();
-  void LoadTAS(const std::string &path) const noexcept;
+  static void LoadTAS(const std::string &path) noexcept;
   void LoadROM(const std::string &path) noexcept;
 private:
   bool aboutOpen = false;
diff --git a/src/frontend/main.cpp b/src/frontend/main.cpp
index 16acce00..533e6bfa 100644
--- a/src/frontend/main.cpp
+++ b/src/frontend/main.cpp
@@ -4,8 +4,8 @@
 int main(int argc, char **argv) {
   KaizenGui kaizenGui; 
   cflags::cflags flags;
-  flags.add_string_callback('\0', "rom", [&kaizenGui](std::string v) { kaizenGui.LoadROM(v); }, "Rom to launch from command-line");
-  flags.add_string_callback('\0', "movie", [&kaizenGui](std::string v) { kaizenGui.LoadTAS(v); }, "Mupen Movie to replay");
+  flags.add_string_callback('\0', "rom", [&kaizenGui](const std::string& v) { kaizenGui.LoadROM(v); }, "Rom to launch from command-line");
+  flags.add_string_callback('\0', "movie", [](const std::string& v) { KaizenGui::LoadTAS(v); }, "Mupen Movie to replay");
 
   if(!flags.parse(argc, argv)) {
     return -1;
diff --git a/src/utils/ErrorData.hpp b/src/utils/ErrorData.hpp
index 465e7bd2..f968237e 100644
--- a/src/utils/ErrorData.hpp
+++ b/src/utils/ErrorData.hpp
@@ -21,6 +21,8 @@ struct Error {
                 case NON_FATAL: return "Error";
                 case UNRECOVERABLE: return "Unrecoverable Error";
             }
+
+            return "Unknown";
         }
     };