nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix another avatar-related critical.

Browse source 
* src/client/conversation-viewer/conversation-message.vala
  (ConversationMessage.load_avatar): We are very occasionally getting
  crashes calling Gtk.Image.get_pixel_size() due to the image is null -
  maybe a race? This obviates the problem by hard-coding the size instead
  of dynamically getting it.
This commit is contained in:
Michael James Gratton 2017-12-08 00:00:48 +11:00
parent b2f0ecab1b
commit b627fd4fc6
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/client/conversation-viewer/conversation-message.vala
View file

@ -429,10 +429,18 @@ public class ConversationMessage : Gtk.Grid {
*/ */
public async void load_avatar(ConversationListBox.AvatarStore loader, public async void load_avatar(ConversationListBox.AvatarStore loader,
Cancellable load_cancelled) { Cancellable load_cancelled) {
const int PIXEL_SIZE = 32;
Geary.RFC822.MailboxAddress? primary = message.get_primary_originator(); Geary.RFC822.MailboxAddress? primary = message.get_primary_originator();
if (primary != null) { if (primary != null) {
int window_scale = get_scale_factor(); int window_scale = get_scale_factor();
int pixel_size = this.avatar.get_pixel_size() * window_scale; // We occasionally get crashes calling as below
// Gtk.Image.get_pixel_size() when the image is
// null. There's perhaps some race going on there. So we
// need to hard-code the size and keep it in sync with
// ui/conversation-message.ui. :(
//
//int pixel_size = this.avatar.get_pixel_size() * window_scale;
int pixel_size = PIXEL_SIZE * window_scale;
try { try {
Gdk.Pixbuf? avatar_buf = yield loader.load( Gdk.Pixbuf? avatar_buf = yield loader.load(
primary, pixel_size, load_cancelled primary, pixel_size, load_cancelled