From 60a902af01be67e6c3dd73a97a4f0863a364e149 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Sun, 10 Nov 2002 07:15:17 +0000
Subject: [PATCH] fix search_for_valid memcheck bug

---
 panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx b/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
index a72ef34efc..4c48422f53 100644
--- a/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
+++ b/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
@@ -2066,10 +2066,13 @@ void wdxGraphicsWindow::search_for_valid_displaymode(UINT RequestedXsize,UINT Re
 
     // ignore memory based checks for min res 640x480.  some cards just dont give accurate memavails.
     // (should I do the check anyway for 640x480 32bpp?)
-    bool bDoMemBasedChecks=((!((RequestedXsize==640)&&(RequestedXsize==480))) &&
+    bool bDoMemBasedChecks=((!((RequestedXsize==640)&&(RequestedYsize==480))) &&
                             (_dxgsg->scrn.MaxAvailVidMem!=UNKNOWN_VIDMEM_SIZE) &&
                             (!special_check_fullscreen_resolution(RequestedXsize,RequestedYsize)));
 
+    if(bVerboseMode || wdxdisplay_cat.is_spam()) {
+        wdxdisplay_cat.info() << "DoMemBasedChecks = " << bDoMemBasedChecks << endl;
+    }
 
     for(int i=0;i<cNumModes;i++) {
         D3DDISPLAYMODE dispmode;