Skip to content

Commit c27d7db

Browse files
committed
SDL: do not track emu state when initializing
1 parent 7e7943f commit c27d7db

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

rpcs3/Emu/System.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ void Emulator::CallFromMainThread(std::function<void()>&& func, atomic_t<u32>* w
185185
m_cb.call_from_main_thread(std::move(final_func), wake_up);
186186
}
187187

188-
void Emulator::BlockingCallFromMainThread(std::function<void()>&& func, std::source_location src_loc) const
188+
void Emulator::BlockingCallFromMainThread(std::function<void()>&& func, bool track_emu_state, std::source_location src_loc) const
189189
{
190190
atomic_t<u32> wake_up = 0;
191191

192192
sys_log.trace("Blocking Callback from thread '%s' at [%s] is queued", thread_ctrl::get_name(), src_loc);
193193

194-
CallFromMainThread(std::move(func), &wake_up, true, umax, src_loc);
194+
CallFromMainThread(std::move(func), &wake_up, track_emu_state, umax, src_loc);
195195

196196
bool logged = false;
197197

rpcs3/Emu/System.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class Emulator final
210210
std::source_location src_loc = std::source_location::current()) const;
211211

212212
// Blocking call from the GUI thread
213-
void BlockingCallFromMainThread(std::function<void()>&& func, std::source_location src_loc = std::source_location::current()) const;
213+
void BlockingCallFromMainThread(std::function<void()>&& func, bool track_emu_state = true, std::source_location src_loc = std::source_location::current()) const;
214214

215215
enum class stop_counter_t : u64{};
216216

rpcs3/Input/sdl_instance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ bool sdl_instance::initialize()
6363
Emu.BlockingCallFromMainThread([this, &instance_success]()
6464
{
6565
instance_success = initialize_impl();
66-
});
66+
}, false);
6767

6868
return instance_success;
6969
}

0 commit comments

Comments
 (0)