summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-10-15 17:48:13 -0400
committerGravatar GitHub2018-10-15 17:48:13 -0400
commit76654113176b1f8759504080a6ccdfd422cd6777 (patch)
treedb5a30c8ca845d08ee680cb1c1969f9a959dc37f
parentMerge pull request #1503 from ReinUsesLisp/misc-vc (diff)
parentcrypto: Various crypto fixes for quickstart guide (diff)
downloadyuzu-76654113176b1f8759504080a6ccdfd422cd6777.tar.gz
yuzu-76654113176b1f8759504080a6ccdfd422cd6777.tar.xz
yuzu-76654113176b1f8759504080a6ccdfd422cd6777.zip
Merge pull request #1500 from DarkLordZach/key-derivation-6.0.0
crypto: Various crypto fixes for quickstart guide
-rw-r--r--src/core/crypto/partition_data_manager.cpp4
-rw-r--r--src/yuzu/main.cpp8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp
index ed5e2b145..25cee1f3a 100644
--- a/src/core/crypto/partition_data_manager.cpp
+++ b/src/core/crypto/partition_data_manager.cpp
@@ -303,8 +303,8 @@ FileSys::VirtualFile FindFileInDirWithNames(const FileSys::VirtualDir& dir,
303 303
304PartitionDataManager::PartitionDataManager(const FileSys::VirtualDir& sysdata_dir) 304PartitionDataManager::PartitionDataManager(const FileSys::VirtualDir& sysdata_dir)
305 : boot0(FindFileInDirWithNames(sysdata_dir, "BOOT0")), 305 : boot0(FindFileInDirWithNames(sysdata_dir, "BOOT0")),
306 fuses(FindFileInDirWithNames(sysdata_dir, "fuse")), 306 fuses(FindFileInDirWithNames(sysdata_dir, "fuses")),
307 kfuses(FindFileInDirWithNames(sysdata_dir, "kfuse")), 307 kfuses(FindFileInDirWithNames(sysdata_dir, "kfuses")),
308 package2({ 308 package2({
309 FindFileInDirWithNames(sysdata_dir, "BCPKG2-1-Normal-Main"), 309 FindFileInDirWithNames(sysdata_dir, "BCPKG2-1-Normal-Main"),
310 FindFileInDirWithNames(sysdata_dir, "BCPKG2-2-Normal-Sub"), 310 FindFileInDirWithNames(sysdata_dir, "BCPKG2-2-Normal-Sub"),
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index cc92ea5b8..d1a068e68 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1428,8 +1428,12 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
1428 QMessageBox::warning( 1428 QMessageBox::warning(
1429 this, tr("Warning Missing Derivation Components"), 1429 this, tr("Warning Missing Derivation Components"),
1430 tr("The following are missing from your configuration that may hinder key " 1430 tr("The following are missing from your configuration that may hinder key "
1431 "derivation. It will be attempted but may not complete.\n\n") + 1431 "derivation. It will be attempted but may not complete.<br><br>") +
1432 errors); 1432 errors +
1433 tr("<br><br>You can get all of these and dump all of your games easily by "
1434 "following <a href='https://yuzu-emu.org/help/quickstart/quickstart/'>the "
1435 "quickstart guide</a>. Alternatively, you can use another method of dumping "
1436 "to obtain all of your keys."));
1433 } 1437 }
1434 1438
1435 QProgressDialog prog; 1439 QProgressDialog prog;