mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-13 21:44:16 +00:00
Fix regression causing mbrtowc(argv) to be called before setlocale()
Fixes #10847
This commit is contained in:
parent
68b9f96f84
commit
2d8fcbcdcd
1 changed files with 3 additions and 4 deletions
|
@ -457,10 +457,6 @@ fn main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn throwing_main() -> i32 {
|
fn throwing_main() -> i32 {
|
||||||
let mut args: Vec<WString> = env::args_os()
|
|
||||||
.map(|osstr| str2wcstring(osstr.as_bytes()))
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let mut res = 1;
|
let mut res = 1;
|
||||||
|
|
||||||
signal_unblock_all();
|
signal_unblock_all();
|
||||||
|
@ -474,6 +470,9 @@ fn throwing_main() -> i32 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let mut args: Vec<WString> = env::args_os()
|
||||||
|
.map(|osstr| str2wcstring(osstr.as_bytes()))
|
||||||
|
.collect();
|
||||||
if args.is_empty() {
|
if args.is_empty() {
|
||||||
args.push("fish".into());
|
args.push("fish".into());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue