Skip to content
This repository was archived by the owner on Nov 16, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ if(USE_SDL)
endif()

# OpenAL
if (NOT ANDROID)
if (USE_OPENAL AND NOT ANDROID)
add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
else()
add_library(3rdparty_openal INTERFACE)
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ option(USE_DISCORD_RPC "Discord rich presence integration" OFF)
option(USE_VULKAN "Vulkan render backend" ON)
option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
option(USE_SDL "Enables SDL input handler" ON)
option(USE_OPENAL "Enable OpenAL microphone support" ON)
option(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF)
option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
option(USE_SYSTEM_FAUDIO "Prefer system FAudio instead of the builtin one" OFF)
Expand Down
9 changes: 9 additions & 0 deletions rpcs3/Emu/Io/DimensionsListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ namespace
std::thread g_listener_thread;
std::atomic<bool> g_listener_running{false};
std::atomic<socket_t> g_listen_sock{invalid_sock};
constexpr auto move_pickup_delay = std::chrono::milliseconds(500);

#ifdef _WIN32
std::thread g_picker_thread;
Expand Down Expand Up @@ -192,6 +193,14 @@ namespace
dim_listener_log.error("Rejected MOVE source: pad=%d index=%d", old_pad, old_index);
return;
}

if (!g_dimensionstoypad.temp_remove(old_index))
{
dim_listener_log.error("Ignored MOVE from empty source slot: pad=%d index=%d", old_pad, old_index);
return;
}

std::this_thread::sleep_for(move_pickup_delay);
g_dimensionstoypad.move_figure(pad, index, old_pad, old_index);
dim_listener_log.notice("MOVE %d/%d -> %d/%d", old_pad, old_index, pad, index);
break;
Expand Down
38 changes: 0 additions & 38 deletions rpcs3/rpcs3qt/gui_application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,44 +108,6 @@ int gui_application::exec()
func();
};

if (!rpcs3::is_release_build() && !rpcs3::is_local_build())
{
steps->push_back([this]()
{
const std::string_view branch_name = rpcs3::get_full_branch();
gui_log.warning("Experimental Build Warning! Build origin: %s", branch_name);

QMessageBox* msg = new QMessageBox();
msg->setAttribute(Qt::WA_DeleteOnClose);
msg->setWindowModality(Qt::WindowModal);
msg->setWindowTitle(tr("Experimental Build Warning"));
msg->setIcon(QMessageBox::Critical);
msg->setTextFormat(Qt::RichText);
msg->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msg->setDefaultButton(QMessageBox::No);
msg->setText(gui::utils::make_paragraph(tr(
"Please understand that this build is not an official RPCS3 release.\n"
"This build contains changes that may break games, or even <b>damage</b> your data.\n"
"We recommend to download and use the official build from the %0.\n"
"\n"
"Build origin: %1\n"
"Do you wish to use this build anyway?")
.arg(gui::utils::make_link(tr("RPCS3 website"), "https://rpcs3.net/download"))
.arg(Qt::convertFromPlainText(branch_name.data()))));
msg->layout()->setSizeConstraint(QLayout::SetFixedSize);
connect(msg, &QMessageBox::finished, this, [this](int)
{
const QMessageBox* box = qobject_cast<QMessageBox*>(sender());
if (!box || box->standardButton(box->clickedButton()) == QMessageBox::No)
{
Emu.Quit(true);
return;
}
m_show_next_dialog();
});
msg->open();
});
}
#ifdef __linux__
const bool is_flatpak = qEnvironmentVariableIsSet("FLATPAK_ID");
const bool is_snap = qEnvironmentVariableIsSet("SNAP");
Expand Down
Loading