Merge branch 'master' into get_firmware_version

README.md

@@ -34,7 +34,7 @@ You should also contact any of the developers in the forums or in the Discord se
 * [CMake 3.8.2+](https://www.cmake.org/download/) (add to PATH)
 * [Python 3.3+](https://www.python.org/downloads/) (add to PATH)
 * [Vulkan SDK](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html))
-* [Qt 5.10+](https://www.qt.io/download-open-source/) (Avoid 5.11.1, due to a bug)
+* [Qt 5.10+](https://www.qt.io/download-qt-installer) (Avoid 5.11.1, due to a bug)
 
 
 **Either add the** `QTDIR` **environment variable, e.g.** `<QtInstallFolder>\5.11.2\msvc2017_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools-19123)**

rpcs3/Emu/Cell/PPUModule.cpp

@@ -1433,7 +1433,7 @@ void ppu_load_exec(const ppu_exec_object& elf)
 	}
 
 	// Set path (TODO)
-	_main->name = "";
+	_main->name.clear();
 	_main->path = vfs::get(Emu.argv[0]);
 
 	// Analyse executable (TODO)

rpcs3/Emu/Cell/lv2/sys_lwcond.cpp

@@ -254,6 +254,8 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 {
 	sys_lwcond.trace("_sys_lwcond_queue_wait(lwcond_id=0x%x, lwmutex_id=0x%x, timeout=0x%llx)", lwcond_id, lwmutex_id, timeout);
 
+	ppu.gpr[3] = CELL_OK;
+
 	std::shared_ptr<lv2_lwmutex> mutex;
 
 	const auto cond = idm::get<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> cpu_thread*
@@ -294,8 +296,6 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 		cond->awake(*cond.ret);
 	}
 
-	ppu.gpr[3] = CELL_OK;
-
 	while (!ppu.state.test_and_reset(cpu_flag::signal))
 	{
 		if (ppu.is_stopped())

rpcs3/Emu/GameInfo.h

@@ -24,7 +24,7 @@ struct GameInfo
 
 	void Reset()
 	{
-		path = "";
+		path.clear();
 
 		name = "Unknown";
 		serial = "Unknown";

rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp

@@ -35,7 +35,7 @@ void CgBinaryDisasm::AddCodeAsm(const std::string& code)
 	case RSX_FP_OPCODE_NOP:
 	case RSX_FP_OPCODE_REP:
 	case RSX_FP_OPCODE_RET: 
-		m_dst_reg_name = "";
+		m_dst_reg_name.clear();
 		op_name = rsx_fp_op_names[m_opcode] + std::string(dst.fp16 ? "H" : "R");
 		break;
 

rpcs3/rpcs3qt/settings_dialog.cpp

@@ -936,10 +936,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 
 	// Checkboxes
 
-	SubscribeTooltip(ui->gs_resizeOnBoot, json_emu_misc["gs_resizeOnBoot"].toString());
-
-	SubscribeTooltip(ui->gs_disableMouse, json_emu_misc["gs_disableMouse"].toString());
-
 	xemu_settings->EnhanceCheckBox(ui->exitOnStop, emu_settings::ExitRPCS3OnFinish);
 	SubscribeTooltip(ui->exitOnStop, json_emu_misc["exitOnStop"].toString());
 
@@ -1041,6 +1037,10 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 	// Global settings (gui_settings)
 	if (!game)
 	{
+		SubscribeTooltip(ui->gs_resizeOnBoot, json_emu_misc["gs_resizeOnBoot"].toString());
+
+		SubscribeTooltip(ui->gs_disableMouse, json_emu_misc["gs_disableMouse"].toString());
+
 		ui->gs_disableMouse->setChecked(xgui_settings->GetValue(gui::gs_disableMouse).toBool());
 		connect(ui->gs_disableMouse, &QCheckBox::clicked, [=](bool val)
 		{
@@ -1075,6 +1075,11 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 			xgui_settings->SetValue(gui::gs_height, ui->gs_height->value());
 		});
 	}
+	else
+	{
+		ui->gb_viewport->setEnabled(false);
+		ui->gb_viewport->setVisible(false);
+	}
 
 	//     _____  _    _  _   _______    _
 	//    / ____|| |  | || | |__   __|  | |
@@ -1083,31 +1088,31 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 	//   | |__| || |__| || |    | | (_| | |_) |
 	//    \_____| \____/ |_|    |_|\__,_|_.__/
 
-	// Comboboxes
-	SubscribeTooltip(ui->combo_configs, json_gui["configs"].toString());
+	if (!game)
+	{
+		// Comboboxes
+		SubscribeTooltip(ui->combo_configs, json_gui["configs"].toString());
 
-	SubscribeTooltip(ui->combo_stylesheets, json_gui["stylesheets"].toString());
+		SubscribeTooltip(ui->combo_stylesheets, json_gui["stylesheets"].toString());
 
-	// Checkboxes:
-	SubscribeTooltip(ui->cb_custom_colors, json_gui["custom_colors"].toString());
+		// Checkboxes:
+		SubscribeTooltip(ui->cb_custom_colors, json_gui["custom_colors"].toString());
 
-	// Checkboxes: gui options
-	SubscribeTooltip(ui->cb_show_welcome, json_gui["show_welcome"].toString());
+		// Checkboxes: gui options
+		SubscribeTooltip(ui->cb_show_welcome, json_gui["show_welcome"].toString());
 
-	SubscribeTooltip(ui->cb_show_exit_game, json_gui["show_exit_game"].toString());
+		SubscribeTooltip(ui->cb_show_exit_game, json_gui["show_exit_game"].toString());
 
-	SubscribeTooltip(ui->cb_show_boot_game, json_gui["show_boot_game"].toString());
+		SubscribeTooltip(ui->cb_show_boot_game, json_gui["show_boot_game"].toString());
 
-	SubscribeTooltip(ui->cb_show_pkg_install, json_gui["show_pkg_install"].toString());
+		SubscribeTooltip(ui->cb_show_pkg_install, json_gui["show_pkg_install"].toString());
 
-	SubscribeTooltip(ui->cb_show_pup_install, json_gui["show_pup_install"].toString());
+		SubscribeTooltip(ui->cb_show_pup_install, json_gui["show_pup_install"].toString());
 
-	SubscribeTooltip(ui->useRichPresence, json_gui["useRichPresence"].toString());
+		SubscribeTooltip(ui->useRichPresence, json_gui["useRichPresence"].toString());
 
-	SubscribeTooltip(ui->discordState, json_gui["discordState"].toString());
+		SubscribeTooltip(ui->discordState, json_gui["discordState"].toString());
 
-	if (!game)
-	{
 		// Discord:
 		ui->useRichPresence->setChecked(m_use_discord);
 		ui->label_discordState->setEnabled(m_use_discord);