isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dateMenu: Get interval for the right timezone

Browse Source 
We're calling get_interval on tzA right now for both the tzA and tzB,
this causes a critical error during shell startup:

g_time_zone_get_offset: assertion 'interval_valid (tz, (guint)interval)' failed

Fix this and use tzB to get the offset for timezone b.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2195>
This commit is contained in:
Jonas Dreßler 2022-02-18 14:26:23 +01:00 committed by Marge Bot
parent aaf47167b5
commit 6c5a8d4ada
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/dateMenu.js
View File

@ -379,7 +379,7 @@ class WorldClocksSection extends St.Button {
const tzA = a.location.get_timezone(); const tzA = a.location.get_timezone();
const tzB = b.location.get_timezone(); const tzB = b.location.get_timezone();
const intA = tzA.find_interval(GLib.TimeType.STANDARD, unixtime); const intA = tzA.find_interval(GLib.TimeType.STANDARD, unixtime);
const intB = tzA.find_interval(GLib.TimeType.STANDARD, unixtime); const intB = tzB.find_interval(GLib.TimeType.STANDARD, unixtime);
return tzA.get_offset(intA) - tzB.get_offset(intB); return tzA.get_offset(intA) - tzB.get_offset(intB);
}); });