From bc65fcb3785ad6b893efbbcf4aba6a0cb7a560f8 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sat, 1 May 2021 18:14:27 +0200 Subject: [PATCH] early-access version 1645 --- README.md | 2 +- src/core/hle/service/hid/controllers/gesture.cpp | 2 +- src/core/hle/service/hid/controllers/touchscreen.cpp | 2 +- src/yuzu/game_list.cpp | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 689072d11..d7f9c80a3 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1644. +This is the source code for early-access 1645. ## Legal Notice diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index 155808f6a..71545bf1f 100755 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp @@ -33,7 +33,7 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing, u shared_memory.header.timestamp = core_timing.GetCPUTicks(); shared_memory.header.total_entry_count = 17; - if (!IsControllerActivated()) { + if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) { shared_memory.header.entry_count = 0; shared_memory.header.last_entry_index = 0; return; diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp index b5f8077be..8f56a0255 100755 --- a/src/core/hle/service/hid/controllers/touchscreen.cpp +++ b/src/core/hle/service/hid/controllers/touchscreen.cpp @@ -33,7 +33,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin shared_memory.header.timestamp = core_timing.GetCPUTicks(); shared_memory.header.total_entry_count = 17; - if (!IsControllerActivated()) { + if (!IsControllerActivated() || !Settings::values.touchscreen.enabled) { shared_memory.header.entry_count = 0; shared_memory.header.last_entry_index = 0; return; diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 48b78d65f..5ff3932dc 100755 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -622,7 +622,8 @@ void GameList::AddPermDirPopup(QMenu& context_menu, QModelIndex selected) { // move the treeview items QList item = item_model->takeRow(row); item_model->invisibleRootItem()->insertRow(row - 1, item); - tree_view->setExpanded(selected, UISettings::values.game_dirs[game_dir_index].expanded); + tree_view->setExpanded(selected.sibling(row - 1, 0), + UISettings::values.game_dirs[other_index].expanded); }); connect(move_down, &QAction::triggered, [this, selected, row, game_dir_index] { @@ -637,7 +638,8 @@ void GameList::AddPermDirPopup(QMenu& context_menu, QModelIndex selected) { // move the treeview items const QList item = item_model->takeRow(row); item_model->invisibleRootItem()->insertRow(row + 1, item); - tree_view->setExpanded(selected, UISettings::values.game_dirs[game_dir_index].expanded); + tree_view->setExpanded(selected.sibling(row + 1, 0), + UISettings::values.game_dirs[other_index].expanded); }); connect(open_directory_location, &QAction::triggered, [this, game_dir_index] {