diff --git a/src/lua/extra.cc b/src/lua/extra.cc index c0421552..f13a8665 100644 --- a/src/lua/extra.cc +++ b/src/lua/extra.cc @@ -176,7 +176,7 @@ void PCSX::LuaFFI::open_extra(Lua L) { "open", [](lua_State* L_) -> int { Lua L(L_); - auto ar = L.getinfo("S", 1); + auto ar = L.getinfo("S", 2); auto name = L.tostring(); IO file = load(name, ar.has_value() ? ar->source : ""); L.push(new LuaFile(file)); diff --git a/src/main/main.cc b/src/main/main.cc index c8f76f4a..3e9292a0 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -56,8 +56,8 @@ class SystemImpl final : public PCSX::System { if (m_args.isGUILogsEnabled()) s_ui->addNotification(s.c_str()); if (s_ui->addLog(PCSX::LogClass::UI, s)) { if (m_args.isStdoutEnabled()) ::fputs(s.c_str(), stdout); - m_eventBus->signal(PCSX::Events::LogMessage{PCSX::LogClass::UI, s}); if (m_logfile) m_logfile->write(std::move(s)); + m_eventBus->signal(PCSX::Events::LogMessage{PCSX::LogClass::UI, s}); } } @@ -66,8 +66,8 @@ class SystemImpl final : public PCSX::System { if (!s_ui->addLog(logClass, s)) return; } if (m_args.isStdoutEnabled()) ::fputs(s.c_str(), stdout); - m_eventBus->signal(PCSX::Events::LogMessage{logClass, s}); if (m_logfile) m_logfile->write(std::move(s)); + m_eventBus->signal(PCSX::Events::LogMessage{logClass, s}); } virtual void printf(std::string &&s) final override { @@ -75,8 +75,8 @@ class SystemImpl final : public PCSX::System { if (!s_ui->addLog(PCSX::LogClass::UNCATEGORIZED, s)) return; } if (m_args.isStdoutEnabled()) ::fputs(s.c_str(), stdout); - m_eventBus->signal(PCSX::Events::LogMessage{PCSX::LogClass::UNCATEGORIZED, s}); if (m_logfile) m_logfile->write(std::move(s)); + m_eventBus->signal(PCSX::Events::LogMessage{PCSX::LogClass::UNCATEGORIZED, s}); } virtual void luaMessage(const std::string &s, bool error) final override { @@ -100,14 +100,14 @@ class SystemImpl final : public PCSX::System { virtual void softReset() final override { // debugger or UI is requesting a reset - m_eventBus->signal(PCSX::Events::ExecutionFlow::Reset{}); PCSX::g_emulator->m_cpu->psxReset(); + m_eventBus->signal(PCSX::Events::ExecutionFlow::Reset{}); } virtual void hardReset() final override { // debugger or UI is requesting a reset - m_eventBus->signal(PCSX::Events::ExecutionFlow::Reset{true}); PCSX::g_emulator->reset(); + m_eventBus->signal(PCSX::Events::ExecutionFlow::Reset{true}); } virtual void close() final override { diff --git a/vsprojects/Lua/Lua.vcxproj b/vsprojects/Lua/Lua.vcxproj index e03146ff..c18567ca 100644 --- a/vsprojects/Lua/Lua.vcxproj +++ b/vsprojects/Lua/Lua.vcxproj @@ -53,6 +53,7 @@ + diff --git a/vsprojects/Lua/Lua.vcxproj.filters b/vsprojects/Lua/Lua.vcxproj.filters index 35b8e1e9..4366cd81 100644 --- a/vsprojects/Lua/Lua.vcxproj.filters +++ b/vsprojects/Lua/Lua.vcxproj.filters @@ -119,5 +119,8 @@ Source Files + + Source Files + \ No newline at end of file