Skip to content

Commit 69014b5

Browse files
committed
Skip Dolphin.ini when updating + GameSettings cleanup
1 parent 3405cdd commit 69014b5

File tree

7 files changed

+8
-180
lines changed

7 files changed

+8
-180
lines changed

Data/Sys/GameSettings/RSB.ini

Lines changed: 0 additions & 13 deletions
This file was deleted.

Data/Sys/GameSettings/RSBE01.ini

Lines changed: 0 additions & 144 deletions
This file was deleted.

Data/Sys/GameSettings/RSBP01.ini

Lines changed: 0 additions & 16 deletions
This file was deleted.

Data/Sys/GameSettings/ID-Project+ Netplay Launcher.ini renamed to Data/user/GameSettings/ID-Project+ Netplay Launcher.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ $[P+] Music Off
33
0x90E60F34:dword:0x00000000
44
[Core]
55
CPUThread = True
6-
# PollingMethod = OnSIRead #not implemented yet
76
GPUDeterminismMode = fake-completion
87
MMU = False

Data/Sys/GameSettings/ID-Project+ Offline Launcher.ini renamed to Data/user/GameSettings/ID-Project+ Offline Launcher.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ $[P+] Music Off
33
0x90E60F34:dword:0x00000000
44
[Core]
55
CPUThread = True
6-
# PollingMethod = OnSIRead #not implemented yet
76
GPUDeterminismMode = fake-completion
87
MMU = False

Data/user/GameSettings/RSBE01.ini

Lines changed: 0 additions & 5 deletions
This file was deleted.

Source/Core/DolphinQt/ProjectPlus/InstallUpdateDialog.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,14 @@ bool InstallUpdateDialog::unzipFile(const std::string& zipFilePath, const std::s
377377
return false;
378378
}
379379

380+
// Skip Dolphin.ini to not wipe a user's config
381+
std::string filename_str = file_info->filename;
382+
if (filename_str.find("Dolphin.ini") != std::string::npos)
383+
{
384+
entry_status = mz_zip_reader_goto_next_entry(reader);
385+
continue;
386+
}
387+
380388
std::string out_path = destDir + "/" + file_info->filename;
381389
if (file_info->filename[strlen(file_info->filename) - 1] == '/')
382390
{

0 commit comments

Comments
 (0)