mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: about panel crash (#37373)

Browse source 
* fix: about panel is a base::Value::Dict

* nix this test for a diff PR
This commit is contained in:
Calvin 2023-02-28 15:26:00 -07:00 • committed by GitHub
parent 3a5ae28c95
commit 2e03bdb9b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
shell/browser/browser_win.cc
View file

@ -734,30 +734,29 @@ void Browser::ShowEmojiPanel() {
}
void Browser::ShowAboutPanel() {
base::Value dict(base::Value::Type::DICTIONARY);
base::Value::Dict dict;
std::string aboutMessage = "";
gfx::ImageSkia image;
// grab defaults from Windows .EXE file
std::unique_ptr<FileVersionInfo> exe_info = FetchFileVersionInfo();
dict.SetStringKey("applicationName", exe_info->file_description());
dict.SetStringKey("applicationVersion", exe_info->product_version());
dict.Set("applicationName", exe_info->file_description());
dict.Set("applicationVersion", exe_info->product_version());
if (about_panel_options_.is_dict()) {
dict.MergeDictionary(&about_panel_options_);
}
// Merge user-provided options, overwriting any of the above
dict.Merge(about_panel_options_.Clone());
std::vector<std::string> stringOptions = {
"applicationName", "applicationVersion", "copyright", "credits"};
const std::string* str;
for (std::string opt : stringOptions) {
if ((str = dict.FindStringKey(opt))) {
if ((str = dict.FindString(opt))) {
aboutMessage.append(*str).append("\r\n");
}
}
if ((str = dict.FindStringKey("iconPath"))) {
if ((str = dict.FindString("iconPath"))) {
base::FilePath path = base::FilePath::FromUTF8Unsafe(*str);
electron::util::PopulateImageSkiaRepsFromPath(&image, path);
}
@ -770,7 +769,7 @@ void Browser::ShowAboutPanel() {
}
void Browser::SetAboutPanelOptions(base::Value::Dict options) {
about_panel_options_ = base::Value(std::move(options));
about_panel_options_ = std::move(options);
}
} // namespace electron