Fix segfault in Tk backend.

mdboom · mdboom · commit 5aa9374824d9 · 2007-07-13T14:25:06.000Z
svn path=/trunk/matplotlib/; revision=3508
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -343,8 +343,7 @@ def destroy(*args):
             self.window = None
             Gcf.destroy(self._num)
 
-        #if not self._shown: self.window.bind("<Destroy>", destroy)
-        if not self._shown: self.canvas._tkcanvas.bind("<Destroy>")
+        if not self._shown: self.canvas._tkcanvas.bind("<Destroy>", destroy)
         _focus = windowing.FocusManager()
         if not self._shown:
             self.window.deiconify()
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -53,6 +53,11 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
 
     long mode;
     long nval;
+    if (Tk_MainWindow(interp) == NULL) {
+        // Will throw a _tkinter.TclError with "this isn't a Tk application"
+        return TCL_ERROR;
+    }
+
     if (argc != 5) {
         Tcl_AppendResult(interp, "usage: ", argv[0],
                          " destPhoto srcImage", (char *) NULL);
