- Bugfixes for non-pil stuff.

gui/Attackwindow.py

@@ -83,7 +83,7 @@ class AttackDisplay(wx.ScrolledWindow):
                 (W,H) = (bmp.GetWidth(), bmp.GetHeight())
                 if self.win.fit:
                     (H,W) = makefit(H,W)
-                    bmp = self.original.Scale(W,H)
+                    bmp = self.original.Scale(H,W)
             self.Image.SetBitmap(wx.BitmapFromImage(bmp))
         elif self.attack.filetype == "ps":
             pil = self.original.copy()

gui/Scytherthread.py

@@ -131,7 +131,7 @@ class AttackThread(threading.Thread):
         cmd = "dot -T%s" % (type)
 
         # execute command
-        cin,cout = os.popen2(cmd)
+        cin,cout = os.popen2(cmd,'b')
         cin.write(attack.scytherDot)
         cin.close()