mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 10:02:47 +00:00
f7f118908a
Chromium crashed when ~/.config/chromium was empty due to incorrect rediff of the patch (there waas no return from function)
Took patch from https://git.altlinux.org/gears/c/chromium.git?p=chromium.git;a=blob;f=.rpm/patches/0001-OPENSUSE-enables-reading-of-the-master-preference.patch;h=ee73ff654a7ff1c2e831f1b5782d399780770e8a;hb=67bb49dda6122ece9f9e79d837595f0dd71dc03d
Fixes: 149500f78 ("change the fix master-prefs-path")
19 lines
787 B
Diff
19 lines
787 B
Diff
diff --git a/chrome/browser/first_run/first_run_internal_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc
|
|
index 33fd579..9890694 100644
|
|
--- a/chrome/installer/util/initial_preferences.cc
|
|
+++ b/chrome/installer/util/initial_preferences.cc
|
|
@@ -75,12 +75,8 @@
|
|
// static
|
|
base::FilePath InitialPreferences::Path(const base::FilePath& dir,
|
|
bool for_read) {
|
|
- base::FilePath initial_prefs = dir.AppendASCII("initial_preferences");
|
|
- if (!for_read || base::PathIsReadable(initial_prefs)) {
|
|
- return initial_prefs;
|
|
- }
|
|
-
|
|
- return dir.AppendASCII("master_preferences");
|
|
+ base::FilePath initial_prefs = base::FilePath("/etc/chromium");
|
|
+ return initial_prefs.AppendASCII("master_preferences");
|
|
}
|
|
#endif // !BUILDFLAG(IS_MAC)
|
|
|