ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11768 from Pokechu22/temporary-debug-command-line 

Treat --debugger command line as a temporary setting
This commit is contained in:
Admiral H. Curtiss 2023-04-18 22:05:08 +02:00 committed by GitHub
parent 361ffd5917 801fa8e905
commit a239af162d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/Main.cpp
View File

@ -257,8 +257,6 @@ int main(int argc, char* argv[])
MainWindow win{std::move(boot), static_cast<const char*>(options.get("movie"))}; MainWindow win{std::move(boot), static_cast<const char*>(options.get("movie"))};
Settings::Instance().SetCurrentUserStyle(Settings::Instance().GetCurrentUserStyle()); Settings::Instance().SetCurrentUserStyle(Settings::Instance().GetCurrentUserStyle());
if (options.is_set("debugger"))
Settings::Instance().SetDebugModeEnabled(true);
win.Show(); win.Show();
#if defined(USE_ANALYTICS) && USE_ANALYTICS #if defined(USE_ANALYTICS) && USE_ANALYTICS

4
Source/Core/DolphinQt/Settings.cpp
View File

@ -465,9 +465,9 @@ void Settings::SetDebugModeEnabled(bool enabled)
{ {
Config::SetBaseOrCurrent(Config::MAIN_ENABLE_DEBUGGING, enabled); Config::SetBaseOrCurrent(Config::MAIN_ENABLE_DEBUGGING, enabled);
emit DebugModeToggled(enabled); emit DebugModeToggled(enabled);
if (enabled)
SetCodeVisible(true);
} }
if (enabled)
SetCodeVisible(true);
} }
bool Settings::IsDebugModeEnabled() const bool Settings::IsDebugModeEnabled() const

7
Source/Core/UICommon/CommandLineParse.cpp
View File

@ -22,7 +22,7 @@ class CommandLineConfigLayerLoader final : public Config::ConfigLayerLoader
{ {
public: public:
CommandLineConfigLayerLoader(const std::list<std::string>& args, const std::string& video_backend, CommandLineConfigLayerLoader(const std::list<std::string>& args, const std::string& video_backend,
const std::string& audio_backend, bool batch) const std::string& audio_backend, bool batch, bool debugger)
: ConfigLayerLoader(Config::LayerType::CommandLine) : ConfigLayerLoader(Config::LayerType::CommandLine)
{ {
if (!video_backend.empty()) if (!video_backend.empty())
@ -39,6 +39,9 @@ public:
if (batch) if (batch)
m_values.emplace_back(Config::MAIN_RENDER_TO_MAIN.GetLocation(), ValueToString(false)); m_values.emplace_back(Config::MAIN_RENDER_TO_MAIN.GetLocation(), ValueToString(false));
if (debugger)
m_values.emplace_back(Config::MAIN_ENABLE_DEBUGGING.GetLocation(), ValueToString(true));
// Arguments are in the format of <System>.<Section>.<Key>=Value // Arguments are in the format of <System>.<Section>.<Key>=Value
for (const auto& arg : args) for (const auto& arg : args)
{ {
@ -134,7 +137,7 @@ static void AddConfigLayer(const optparse::Values& options)
Config::AddLayer(std::make_unique<CommandLineConfigLayerLoader>( Config::AddLayer(std::make_unique<CommandLineConfigLayerLoader>(
std::move(config_args), static_cast<const char*>(options.get("video_backend")), std::move(config_args), static_cast<const char*>(options.get("video_backend")),
static_cast<const char*>(options.get("audio_emulation")), static_cast<const char*>(options.get("audio_emulation")),
static_cast<bool>(options.get("batch")))); static_cast<bool>(options.get("batch")), static_cast<bool>(options.get("debugger"))));
} }
optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv) optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv)