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

Merge branch 'nullfix' into 'master'

Browse source 
PropertyCommand: check for null before calling printf

See merge request GNOME/geary!79
This commit is contained in:
Michael Gratton 2019-01-10 07:07:58 +00:00
commit 9df110bc30
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/client/application/application-command.vala
View file

@ -193,10 +193,18 @@ public class Application.PropertyCommand<T> : Application.Command {
this.object.get(this.property_name, ref this.old_value);
this.undo_label = undo_label.printf(this.old_value);
this.redo_label = redo_label.printf(this.new_value);
this.executed_label = executed_label.printf(this.new_value);
this.undone_label = undone_label.printf(this.old_value);
if (undo_label != null) {
this.undo_label = undo_label.printf(this.old_value);
}
if (redo_label != null) {
this.redo_label = redo_label.printf(this.new_value);
}
if (executed_label != null) {
this.executed_label = executed_label.printf(this.new_value);
}
if (undone_label != null) {
this.undone_label = undone_label.printf(this.old_value);
}
}
public async override void execute(GLib.Cancellable? cancellable) {