[meld] filediff: Use new synchronous mode when resolving conflicts (bgo#786867)

[Kai Willadsen <kaiw src gnome org>]

commit 82e09513283dd6ece4582094ea9c8a3237563186
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Sep 2 07:50:13 2017 +1000

    filediff: Use new synchronous mode when resolving conflicts (bgo#786867)

 meld/filediff.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 9cf02c4..fecab93 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -830,7 +830,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 if resolve_response == Gtk.ResponseType.OK:
                     bufdata = self.textbuffer[1].data
                     conflict_file = bufdata.savefile or bufdata.filename
-                    parent.command('resolve', [conflict_file])
+                    # It's possible that here we're in a quit callback,
+                    # so we can't schedule the resolve action to an
+                    # idle loop; it might never happen.
+                    parent.command('resolve', [conflict_file], sync=True)
         elif response == Gtk.ResponseType.CANCEL:
             self.state = melddoc.STATE_NORMAL